Rework asciidoc generation includes

eclipse-vertx · Sep 10, 2024 · 96eb1c0 · 96eb1c0
1 parent 76eba2d
commit 96eb1c0
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,6 @@
     <unix.socket.port/>
     <jar.manifest>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</jar.manifest>
     <testcontainers.version>1.17.6</testcontainers.version>
-    <docgen.source>${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc,${vertx.asciidoc.sources.dir}/*.adoc</docgen.source>
   </properties>
 
   <dependencyManagement>
@@ -147,14 +146,6 @@
                     <classifier>processor</classifier>
                   </annotationProcessorPath>
                 </annotationProcessorPaths>
-                <compilerArgs>
-                  <!-- Configure the docgen processor -->
-                  <compilerArg>-Adocgen.source=${docgen.source}</compilerArg>
-                  <compilerArg>-Adocgen.output=${project.build.directory}/asciidoc/java</compilerArg>
-                  <compilerArg>-Amaven.groupId=${project.groupId}</compilerArg>
-                  <compilerArg>-Amaven.artifactId=${project.artifactId}</compilerArg>
-                  <compilerArg>-Amaven.version=${project.version}</compilerArg>
-                </compilerArgs>
               </configuration>
             </execution>
             <execution>

diff --git a/vertx-db2-client/pom.xml b/vertx-db2-client/pom.xml
@@ -31,6 +31,10 @@
   <url>https://github.com/eclipse-vertx/vertx-sql-client</url>
   <description>The Reactive DB2 client</description>
 
+  <properties>
+    <vertx.asciidoc.sources.dir>${project.basedir}/src/main/asciidoc/*.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc</vertx.asciidoc.sources.dir>
+  </properties>
+
   <dependencies>
 
     <!-- Vert.x dependencies -->

diff --git a/vertx-mssql-client/pom.xml b/vertx-mssql-client/pom.xml
@@ -16,6 +16,10 @@
   <url>https://github.com/eclipse-vertx/vertx-sql-client</url>
   <description>The Reactive MSSQL Client</description>
 
+  <properties>
+    <vertx.asciidoc.sources.dir>${project.basedir}/src/main/asciidoc/*.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc</vertx.asciidoc.sources.dir>
+  </properties>
+
   <dependencies>
 
     <!-- Vert.x dependencies -->

diff --git a/vertx-mysql-client/pom.xml b/vertx-mysql-client/pom.xml
@@ -31,6 +31,10 @@
   <url>https://github.com/eclipse-vertx/vertx-sql-client</url>
   <description>The Reactive MySQL Client</description>
 
+  <properties>
+    <vertx.asciidoc.sources.dir>${project.basedir}/src/main/asciidoc/*.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc</vertx.asciidoc.sources.dir>
+  </properties>
+
   <dependencies>
 
     <!-- Vert.x dependencies -->

diff --git a/vertx-oracle-client/pom.xml b/vertx-oracle-client/pom.xml
@@ -34,7 +34,7 @@
 
   <properties>
     <ojdbc.version>23.4.0.24.05</ojdbc.version>
-    <docgen.source>${project.basedir}/../vertx-sql-client/src/main/asciidoc/connections.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/cursor.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/queries.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/tracing.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/transactions.adoc,${asciidoc.dir}/*.adoc</docgen.source>
+    <vertx.asciidoc.sources.dir>${project.basedir}/src/main/asciidoc/*.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc</vertx.asciidoc.sources.dir>
   </properties>
 
   <dependencies>

diff --git a/vertx-oracle-client/src/main/java/examples/SqlClientExamples.java b/vertx-oracle-client/src/main/java/examples/SqlClientExamples.java
@@ -350,4 +350,19 @@ public void dynamicPoolConfig(Vertx vertx, PoolOptions poolOptions) {
   private Future<SqlConnectOptions> retrieveOptions() {
     return null;
   }
+
+  public void poolSharing1() {
+  }
+
+  public void poolSharing2() {
+  }
+
+  public void poolSharing3() {
+  }
+
+  public void poolConfig01() {
+  }
+
+  public void poolConfig02() {
+  }
 }
diff --git a/vertx-pg-client/pom.xml b/vertx-pg-client/pom.xml
@@ -34,6 +34,7 @@
   <properties>
     <!-- Set to a value for testing with a specific database -->
     <embedded.postgres.version />
+    <vertx.asciidoc.sources.dir>${project.basedir}/src/main/asciidoc/*.adoc,${project.basedir}/../vertx-sql-client/src/main/asciidoc/*.adoc</vertx.asciidoc.sources.dir>
   </properties>
 
   <dependencies>

diff --git a/vertx-sql-client-templates/pom.xml b/vertx-sql-client-templates/pom.xml
@@ -31,10 +31,6 @@
   <url>https://github.com/eclipse-vertx/vertx-sql-client</url>
   <description>Vert.x SQL Client Templates</description>
 
-  <properties>
-    <docgen.source>${vertx.asciidoc.sources.dir}</docgen.source>
-  </properties>
-
   <dependencies>
 
     <!-- Vert.x dependencies -->