[#396] Fix compilation with JDK 23+

infinispan · Jan 7, 2025 · 897b02b · 897b02b
1 parent 6399029
commit 897b02b
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 9 deletions.
diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
@@ -53,3 +53,24 @@ jobs:
           name: jdk21-test-results
           path: "**/target/*-reports*/**/TEST-*.xml"
 
+  jdk-ea:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '24-ea'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: JDK EA Tests
+        run: mvn -B clean install artifact:compare -Dmaven.test.failure.ignore=true -Dansi.strip=true
+
+      - name: Test Logs
+        uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: jdk-ea-test-results
+          path: "**/target/*-reports*/**/TEST-*.xml"
diff --git a/core/pom.xml b/core/pom.xml
@@ -27,7 +27,7 @@
 
         <dependency>
             <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
+            <artifactId>jboss-logging-annotations</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -120,6 +120,13 @@
                     <compilerArgs>
                         <arg>-Aorg.jboss.logging.tools.addGeneratedAnnotation=false</arg>
                     </compilerArgs>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.jboss.logging</groupId>
+                            <artifactId>jboss-logging-processor</artifactId>
+                            <version>${version.jboss.logging.processor}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
 

diff --git a/integrationtests/pom.xml b/integrationtests/pom.xml
@@ -109,6 +109,18 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-testCompile</id>
+                        <configuration>
+                            <annotationProcessors>
+                                <annotationProcessor>
+                                    org.infinispan.protostream.annotations.impl.processor.AutoProtoSchemaBuilderAnnotationProcessor
+                                </annotationProcessor>
+                            </annotationProcessors>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>

diff --git a/processor/pom.xml b/processor/pom.xml
@@ -26,12 +26,6 @@
             <artifactId>jboss-logging</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>protostream</artifactId>
@@ -60,6 +54,28 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <configuration>
+                            <annotationProcessors>
+                                <annotationProcessor>
+                                    com.google.auto.service.processor.AutoServiceProcessor
+                                </annotationProcessor>
+                            </annotationProcessors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-testCompile</id>
+                        <configuration>
+                            <annotationProcessors>
+                                <annotationProcessor>
+                                    org.infinispan.protostream.annotations.impl.processor.AutoProtoSchemaBuilderAnnotationProcessor
+                                </annotationProcessor>
+                            </annotationProcessors>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>

diff --git a/types/pom.xml b/types/pom.xml
@@ -25,9 +25,9 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.infinispan.protostream</groupId>
             <artifactId>protostream-processor</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -74,6 +74,15 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>protostream-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
             </plugin>
 
             <plugin>