Bump vertx5-parent to 4 and adjust compiler processor configuration

vert-x3 · Sep 10, 2024 · e31ec56 · e31ec56
1 parent a2a4d80
commit e31ec56
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>io.vertx</groupId>
     <artifactId>vertx5-parent</artifactId>
-    <version>3</version>
+    <version>4</version>
   </parent>
 
   <artifactId>vertx-infinispan-parent</artifactId>
@@ -62,13 +62,21 @@
           <executions>
             <execution>
               <id>default-compile</id>
-              <phase>compile</phase>
               <configuration>
-                <annotationProcessors>
-                  <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-processor</artifactId>
+                    <classifier>processor</classifier>
+                  </annotationProcessorPath>
+                </annotationProcessorPaths>
                 <compilerArgs>
-                  <compilerArg>-Adocgen.source=${asciidoc.dir}</compilerArg>
+                  <compilerArg>-Adocgen.source=${vertx.asciidoc.sources.dir}</compilerArg>
                   <compilerArg>-Adocgen.output=${project.build.directory}/asciidoc/java</compilerArg>
                   <compilerArg>-Amaven.groupId=${project.groupId}</compilerArg>
                   <compilerArg>-Amaven.artifactId=${project.artifactId}</compilerArg>

diff --git a/vertx-infinispan/pom.xml b/vertx-infinispan/pom.xml
@@ -125,15 +125,20 @@
       <artifactId>reactive-streams</artifactId>
       <version>1.0.3</version>
     </dependency>
+
     <dependency>
       <groupId>io.vertx</groupId>
-      <artifactId>vertx-docgen</artifactId>
-      <scope>provided</scope>
+      <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-codegen</artifactId>
+      <artifactId>vertx-docgen-api</artifactId>
       <optional>true</optional>
     </dependency>
 

diff --git a/vertx-web-sstore-infinispan/pom.xml b/vertx-web-sstore-infinispan/pom.xml
@@ -31,8 +31,6 @@
   <name>Vert.x Web Session Store with Infinispan</name>
 
   <properties>
-    <doc.skip>false</doc.skip>
-    <asciidoc.dir>${project.basedir}/src/main/asciidoc</asciidoc.dir>
     <jar.manifest>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</jar.manifest>
   </properties>
 
@@ -43,14 +41,17 @@
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
-      <artifactId>vertx-codegen</artifactId>
-      <scope>provided</scope>
+      <artifactId>vertx-codegen-api</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>io.vertx</groupId>
-      <artifactId>vertx-docgen</artifactId>
-      <scope>provided</scope>
+      <artifactId>vertx-codegen-json</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-docgen-api</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>