enh: Compiles on JDK 21. Fixes #1077

apache · Sep 23, 2023 · f1889f8 · f1889f8
1 parent 946aab8
commit f1889f8
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 24 deletions.
diff --git a/integration-tests/jakarta-ee/pom.xml b/integration-tests/jakarta-ee/pom.xml
@@ -37,6 +37,8 @@
         <maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
         <maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
         <arquillian.version>1.7.1.Final</arquillian.version>
+        <arquillian.drone.version>2.5.6</arquillian.drone.version>
+        <arquillian.graphene.version>2.5.4</arquillian.graphene.version>
         <failsafe.argLine>
             --add-opens java.base/java.lang=ALL-UNNAMED
             --add-opens java.base/java.net=ALL-UNNAMED
@@ -137,12 +139,6 @@
             <version>2.1.6</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>${mockito-inline.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
@@ -185,7 +181,7 @@
         <dependency>
             <groupId>org.jboss.arquillian.graphene</groupId>
             <artifactId>graphene-webdriver</artifactId>
-            <version>2.5.4</version>
+            <version>${arquillian.graphene.version}</version>
             <scope>test</scope>
             <type>pom</type>
         </dependency>
@@ -203,7 +199,7 @@
             <dependency>
                 <groupId>org.jboss.arquillian.extension</groupId>
                 <artifactId>arquillian-drone-bom</artifactId>
-                <version>2.5.6</version>
+                <version>${arquillian.drone.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -219,6 +215,18 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
             </plugin>

diff --git a/...tion-tests/jakarta-ee/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...tion-tests/jakarta-ee/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/pom.xml b/pom.xml
@@ -119,9 +119,9 @@
         <!-- Test 3rd-party dependencies: -->
         <easymock.version>5.2.0</easymock.version>
         <mockito.version>5.5.0</mockito.version>
-        <mockito-inline.version>5.2.0</mockito-inline.version>
+        <bytebuddy.version>1.14.8</bytebuddy.version>
         <gmaven.version>3.0.0</gmaven.version>
-        <groovy.version>4.0.13</groovy.version>
+        <groovy.version>4.0.15</groovy.version>
         <junit.version>5.10.0</junit.version>
         <junit.server.jetty.version>3.0.0</junit.server.jetty.version>
         <hibernate.version>5.6.15.Final</hibernate.version>
@@ -343,6 +343,7 @@
                             <exclude>**/target/**</exclude>
                             <exclude>**/nb-configuration.xml</exclude>
                             <exclude>**/faces-config.NavData</exclude>
+                            <exclude>**/org.mockito.plugins.MockMaker</exclude>
                         </excludes>
                     </configuration>
                 </plugin>
@@ -606,6 +607,13 @@
                         <arg>-Xlint:deprecation</arg>
                         <arg>-Xlint:unchecked</arg>
                     </compilerArgs>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.aspectj</groupId>
+                            <artifactId>aspectjweaver</artifactId>
+                            <version>${aspectj.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>
@@ -1075,6 +1083,16 @@
                 <version>2.1.0</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${bytebuddy.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy-agent</artifactId>
+                <version>${bytebuddy.version}</version>
+            </dependency>
             <dependency>
                 <!-- used for the 'hashpass' command line tool: -->
                 <groupId>commons-cli</groupId>
@@ -1542,6 +1560,7 @@
                         <exclude>**/target/**</exclude>
                         <exclude>**/nb-configuration.xml</exclude>
                         <exclude>**/faces-config.NavData</exclude>
+                        <exclude>**/org.mockito.plugins.MockMaker</exclude>
                     </excludes>
                 </configuration>
             </plugin>

diff --git a/support/cdi/pom.xml b/support/cdi/pom.xml
@@ -68,13 +68,6 @@
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>${mockito-inline.version}</version>
-            <scope>test</scope>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
@@ -86,6 +79,18 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/support/jakarta-ee/pom.xml b/support/jakarta-ee/pom.xml
@@ -87,13 +87,6 @@
             <scope>test</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>${mockito-inline.version}</version>
-            <scope>test</scope>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
@@ -105,6 +98,18 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>