From 090917fb39765f7b58914490758f184145b50c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Mal=C3=A9=C5=99?= Date: Tue, 15 Oct 2024 16:49:22 +0200 Subject: [PATCH 1/3] Tweaking the Datasource guide content conditionals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Maléř --- docs/src/main/asciidoc/datasource.adoc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/src/main/asciidoc/datasource.adoc b/docs/src/main/asciidoc/datasource.adoc index cc16c346dd980..220db0e78b8d0 100644 --- a/docs/src/main/asciidoc/datasource.adoc +++ b/docs/src/main/asciidoc/datasource.adoc @@ -65,10 +65,12 @@ For more details and optional configurations, see xref:databases-dev-services.ad * `quarkus-jdbc-db2` * `quarkus-jdbc-derby` -ifdef::note-quarkus-derby[] + -{note-quarkus-derby} +-- +ifdef::note-quarkus-derby[] +include::resources/snippets/snip-note-derby.adoc[] endif::note-quarkus-derby[] +-- * `quarkus-jdbc-h2` * `quarkus-jdbc-mariadb` * `quarkus-jdbc-mssql` @@ -155,10 +157,12 @@ Quarkus currently includes the following built-in database kinds: + * DB2: `db2` * Derby: `derby` -ifdef::note-quarkus-derby[] + -{note-quarkus-derby} +-- +ifdef::note-quarkus-derby[] +include::resources/snippets/snip-note-derby.adoc[] endif::note-quarkus-derby[] +-- * H2: `h2` * MariaDB: `mariadb` * Microsoft SQL Server: `mssql` @@ -199,10 +203,12 @@ JDBC is the most common database connection pattern, typically needed when used .. For use with a built-in JDBC driver, choose and add the Quarkus extension for your relational database driver from the list below: + * Derby - `quarkus-jdbc-derby` -ifdef::note-quarkus-derby[] + -{note-quarkus-derby} +-- +ifdef::note-quarkus-derby[] +include::resources/snippets/snip-note-derby.adoc[] endif::note-quarkus-derby[] +-- * H2 - `quarkus-jdbc-h2` + [NOTE] From 35c6d326066a3e13bf091e5db35aca6bd92bf8d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Mal=C3=A9=C5=99?= Date: Wed, 16 Oct 2024 12:56:24 +0200 Subject: [PATCH 2/3] removing -- blocks from ifdefs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Maléř --- docs/src/main/asciidoc/datasource.adoc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/src/main/asciidoc/datasource.adoc b/docs/src/main/asciidoc/datasource.adoc index 220db0e78b8d0..7ca8f3a96cb76 100644 --- a/docs/src/main/asciidoc/datasource.adoc +++ b/docs/src/main/asciidoc/datasource.adoc @@ -66,11 +66,9 @@ For more details and optional configurations, see xref:databases-dev-services.ad * `quarkus-jdbc-db2` * `quarkus-jdbc-derby` + --- ifdef::note-quarkus-derby[] include::resources/snippets/snip-note-derby.adoc[] endif::note-quarkus-derby[] --- * `quarkus-jdbc-h2` * `quarkus-jdbc-mariadb` * `quarkus-jdbc-mssql` @@ -158,11 +156,9 @@ Quarkus currently includes the following built-in database kinds: * DB2: `db2` * Derby: `derby` + --- ifdef::note-quarkus-derby[] include::resources/snippets/snip-note-derby.adoc[] endif::note-quarkus-derby[] --- * H2: `h2` * MariaDB: `mariadb` * Microsoft SQL Server: `mssql` @@ -204,11 +200,9 @@ JDBC is the most common database connection pattern, typically needed when used + * Derby - `quarkus-jdbc-derby` + --- ifdef::note-quarkus-derby[] include::resources/snippets/snip-note-derby.adoc[] endif::note-quarkus-derby[] --- * H2 - `quarkus-jdbc-h2` + [NOTE] From d842d7b57658542161f94cec7809f40af92c449f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Mal=C3=A9=C5=99?= Date: Fri, 18 Oct 2024 15:13:58 +0200 Subject: [PATCH 3/3] Adding an empty snipet+applying a simple include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Maléř --- .../src/main/asciidoc/_includes/snip-note-derby.adoc | 0 docs/src/main/asciidoc/datasource.adoc | 12 +++--------- 2 files changed, 3 insertions(+), 9 deletions(-) create mode 100644 docs/src/main/asciidoc/_includes/snip-note-derby.adoc diff --git a/docs/src/main/asciidoc/_includes/snip-note-derby.adoc b/docs/src/main/asciidoc/_includes/snip-note-derby.adoc new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/docs/src/main/asciidoc/datasource.adoc b/docs/src/main/asciidoc/datasource.adoc index 7ca8f3a96cb76..26efbb68acb09 100644 --- a/docs/src/main/asciidoc/datasource.adoc +++ b/docs/src/main/asciidoc/datasource.adoc @@ -66,9 +66,7 @@ For more details and optional configurations, see xref:databases-dev-services.ad * `quarkus-jdbc-db2` * `quarkus-jdbc-derby` + -ifdef::note-quarkus-derby[] -include::resources/snippets/snip-note-derby.adoc[] -endif::note-quarkus-derby[] +include::_includes/snip-note-derby.adoc[] * `quarkus-jdbc-h2` * `quarkus-jdbc-mariadb` * `quarkus-jdbc-mssql` @@ -156,9 +154,7 @@ Quarkus currently includes the following built-in database kinds: * DB2: `db2` * Derby: `derby` + -ifdef::note-quarkus-derby[] -include::resources/snippets/snip-note-derby.adoc[] -endif::note-quarkus-derby[] +include::_includes/snip-note-derby.adoc[] * H2: `h2` * MariaDB: `mariadb` * Microsoft SQL Server: `mssql` @@ -200,9 +196,7 @@ JDBC is the most common database connection pattern, typically needed when used + * Derby - `quarkus-jdbc-derby` + -ifdef::note-quarkus-derby[] -include::resources/snippets/snip-note-derby.adoc[] -endif::note-quarkus-derby[] +include::_includes/snip-note-derby.adoc[] * H2 - `quarkus-jdbc-h2` + [NOTE]