Bump vertx5-parent to 4 and adjust compiler processor configuration

vietj · vietj · commit 39244001669c · 2024-09-10T09:08:34.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>io.vertx</groupId>
     <artifactId>vertx5-parent</artifactId>
-    <version>3</version>
+    <version>4</version>
   </parent>
 
   <artifactId>vertx-sql-client-parent</artifactId>
@@ -71,6 +71,23 @@
 
   <dependencies>
 
+    <!-- Code generation -->
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-codegen-api</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-codegen-json</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-docgen-api</artifactId>
+      <optional>true</optional>
+    </dependency>
+
     <!-- Testing purposes -->
     <dependency>
       <groupId>junit</groupId>
@@ -118,18 +135,16 @@
             <execution>
               <id>default-compile</id>
               <configuration>
-                <annotationProcessors>
-                  <annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
-                  <annotationProcessor>io.vertx.docgen.JavaDocGenProcessor</annotationProcessor>
-                </annotationProcessors>
                 <annotationProcessorPaths>
                   <annotationProcessorPath>
                     <groupId>io.vertx</groupId>
                     <artifactId>vertx-codegen</artifactId>
+                    <classifier>processor</classifier>
                   </annotationProcessorPath>
                   <annotationProcessorPath>
                     <groupId>io.vertx</groupId>
-                    <artifactId>vertx-docgen</artifactId>
+                    <artifactId>vertx-docgen-processor</artifactId>
+                    <classifier>processor</classifier>
                   </annotationProcessorPath>
                 </annotationProcessorPaths>
                 <compilerArgs>
diff --git a/vertx-db2-client/pom.xml b/vertx-db2-client/pom.xml
@@ -38,16 +38,6 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-codegen</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-docgen</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-sql-client</artifactId>
diff --git a/vertx-db2-client/src/main/java/module-info.java b/vertx-db2-client/src/main/java/module-info.java
@@ -13,7 +13,7 @@
   exports io.vertx.db2client;
   exports io.vertx.db2client.spi;
 
-  requires static vertx.docgen;
+  requires static io.vertx.docgen;
   requires static io.vertx.codegen.api;
   requires static io.vertx.codegen.json;
 
diff --git a/vertx-mssql-client/pom.xml b/vertx-mssql-client/pom.xml
@@ -23,16 +23,6 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-codegen</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-docgen</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-sql-client</artifactId>
diff --git a/vertx-mssql-client/src/main/java/module-info.java b/vertx-mssql-client/src/main/java/module-info.java
@@ -13,7 +13,7 @@
   exports io.vertx.mssqlclient;
   exports io.vertx.mssqlclient.spi;
 
-  requires static vertx.docgen;
+  requires static io.vertx.docgen;
   requires static io.vertx.codegen.api;
   requires static io.vertx.codegen.json;
 
diff --git a/vertx-mysql-client/pom.xml b/vertx-mysql-client/pom.xml
@@ -38,16 +38,6 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-codegen</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-docgen</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-sql-client</artifactId>
diff --git a/vertx-mysql-client/src/main/java/module-info.java b/vertx-mysql-client/src/main/java/module-info.java
@@ -14,7 +14,7 @@
   exports io.vertx.mysqlclient.spi;
   exports io.vertx.mysqlclient.data.spatial;
 
-  requires static vertx.docgen;
+  requires static io.vertx.docgen;
   requires static io.vertx.codegen.api;
   requires static io.vertx.codegen.json;
 
diff --git a/vertx-oracle-client/pom.xml b/vertx-oracle-client/pom.xml
@@ -51,16 +51,6 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-codegen</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-docgen</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-sql-client</artifactId>
diff --git a/vertx-oracle-client/src/main/java/module-info.java b/vertx-oracle-client/src/main/java/module-info.java
@@ -15,7 +15,7 @@
   exports io.vertx.oracleclient.data;
   exports io.vertx.oracleclient.spi;
 
-  requires static vertx.docgen;
+  requires static io.vertx.docgen;
   requires static io.vertx.codegen.api;
   requires static io.vertx.codegen.json;
 
diff --git a/vertx-pg-client/pom.xml b/vertx-pg-client/pom.xml
@@ -43,16 +43,6 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-codegen</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-docgen</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-sql-client</artifactId>
diff --git a/vertx-pg-client/src/main/java/module-info.java b/vertx-pg-client/src/main/java/module-info.java
@@ -18,7 +18,7 @@
   exports io.vertx.pgclient.data;
   exports io.vertx.pgclient.pubsub;
 
-  requires static vertx.docgen;
+  requires static io.vertx.docgen;
   requires static io.vertx.codegen.api;
   requires static io.vertx.codegen.json;
 
diff --git a/vertx-sql-client-templates/pom.xml b/vertx-sql-client-templates/pom.xml
@@ -32,7 +32,7 @@
   <description>Vert.x SQL Client Templates</description>
 
   <properties>
-    <docgen.source>${asciidoc.dir}</docgen.source>
+    <docgen.source>${vertx.asciidoc.sources.dir}</docgen.source>
   </properties>
 
   <dependencies>
@@ -42,21 +42,6 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-sql-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-codegen-processor</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-codegen-api</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-docgen</artifactId>
-      <optional>true</optional>
-    </dependency>
 
     <!-- For testing -->
     <dependency>
diff --git a/vertx-sql-client-templates/src/main/java/module-info.java b/vertx-sql-client-templates/src/main/java/module-info.java
@@ -4,6 +4,6 @@
   requires io.vertx.codegen.api;
   requires io.vertx.core;
   requires java.compiler;
-  requires static vertx.docgen;
+  requires static io.vertx.docgen;
 
 }
diff --git a/vertx-sql-client/pom.xml b/vertx-sql-client/pom.xml
@@ -39,16 +39,6 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-codegen</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-docgen</artifactId>
-      <optional>true</optional>
-    </dependency>
 
   </dependencies>
 
@@ -61,9 +51,13 @@
             <execution>
               <id>default-compile</id>
               <configuration>
-                <annotationProcessors>
-                  <annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
-                </annotationProcessors>
+                <annotationProcessorPaths>
+                  <annotationProcessorPath>
+                    <groupId>io.vertx</groupId>
+                    <artifactId>vertx-codegen</artifactId>
+                    <classifier>processor</classifier>
+                  </annotationProcessorPath>
+                </annotationProcessorPaths>
               </configuration>
             </execution>
           </executions>
diff --git a/vertx-sql-client/src/main/generated/io/vertx/sqlclient/SqlConnectOptionsConverter.java b/vertx-sql-client/src/main/generated/io/vertx/sqlclient/SqlConnectOptionsConverter.java
@@ -85,6 +85,11 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, SqlConn
             obj.setReconnectInterval(((Number)member.getValue()).longValue());
           }
           break;
+        case "metricsName":
+          if (member.getValue() instanceof String) {
+            obj.setMetricsName((String)member.getValue());
+          }
+          break;
         case "sslOptions":
           if (member.getValue() instanceof JsonObject) {
             obj.setSslOptions(new io.vertx.core.net.ClientSSLOptions((io.vertx.core.json.JsonObject)member.getValue()));
@@ -125,6 +130,9 @@ static void toJson(SqlConnectOptions obj, java.util.Map<String, Object> json) {
     json.put("usingDomainSocket", obj.isUsingDomainSocket());
     json.put("reconnectAttempts", obj.getReconnectAttempts());
     json.put("reconnectInterval", obj.getReconnectInterval());
+    if (obj.getMetricsName() != null) {
+      json.put("metricsName", obj.getMetricsName());
+    }
     if (obj.getSslOptions() != null) {
       json.put("sslOptions", obj.getSslOptions().toJson());
     }
