Skip to content

Commit f1889f8

Browse files
lprimaklprimak
committed
enh: Compiles on JDK 21. Fixes #1077 
1 parent 946aab8 commit f1889f8

File tree

5 files changed

+62
-24
lines changed

5 files changed

+62
-24
lines changed

‎integration-tests/jakarta-ee/pom.xml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
3838
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
3939
<arquillian.version>1.7.1.Final</arquillian.version>
40+
<arquillian.drone.version>2.5.6</arquillian.drone.version>
41+
<arquillian.graphene.version>2.5.4</arquillian.graphene.version>
4042
<failsafe.argLine>
4143
--add-opens java.base/java.lang=ALL-UNNAMED
4244
--add-opens java.base/java.net=ALL-UNNAMED
@@ -137,12 +139,6 @@
137139
<version>2.1.6</version>
138140
<scope>test</scope>
139141
</dependency>
140-
<dependency>
141-
<groupId>org.mockito</groupId>
142-
<artifactId>mockito-inline</artifactId>
143-
<version>${mockito-inline.version}</version>
144-
<scope>test</scope>
145-
</dependency>
146142
<dependency>
147143
<groupId>org.slf4j</groupId>
148144
<artifactId>slf4j-jdk14</artifactId>
@@ -185,7 +181,7 @@
185181
<dependency>
186182
<groupId>org.jboss.arquillian.graphene</groupId>
187183
<artifactId>graphene-webdriver</artifactId>
188-
<version>2.5.4</version>
184+
<version>${arquillian.graphene.version}</version>
189185
<scope>test</scope>
190186
<type>pom</type>
191187
</dependency>
@@ -203,7 +199,7 @@
203199
<dependency>
204200
<groupId>org.jboss.arquillian.extension</groupId>
205201
<artifactId>arquillian-drone-bom</artifactId>
206-
<version>2.5.6</version>
202+
<version>${arquillian.drone.version}</version>
207203
<type>pom</type>
208204
<scope>import</scope>
209205
</dependency>
@@ -219,6 +215,18 @@
219215

220216
<build>
221217
<plugins>
218+
<plugin>
219+
<artifactId>maven-compiler-plugin</artifactId>
220+
<configuration>
221+
<annotationProcessorPaths>
222+
<annotationProcessorPath>
223+
<groupId>org.projectlombok</groupId>
224+
<artifactId>lombok</artifactId>
225+
<version>${lombok.version}</version>
226+
</annotationProcessorPath>
227+
</annotationProcessorPaths>
228+
</configuration>
229+
</plugin>
222230
<plugin>
223231
<artifactId>maven-war-plugin</artifactId>
224232
</plugin>

‎integration-tests/jakarta-ee/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mock-maker-inline

‎pom.xml‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@
119119
<!-- Test 3rd-party dependencies: -->
120120
<easymock.version>5.2.0</easymock.version>
121121
<mockito.version>5.5.0</mockito.version>
122-
<mockito-inline.version>5.2.0</mockito-inline.version>
122+
<bytebuddy.version>1.14.8</bytebuddy.version>
123123
<gmaven.version>3.0.0</gmaven.version>
124-
<groovy.version>4.0.13</groovy.version>
124+
<groovy.version>4.0.15</groovy.version>
125125
<junit.version>5.10.0</junit.version>
126126
<junit.server.jetty.version>3.0.0</junit.server.jetty.version>
127127
<hibernate.version>5.6.15.Final</hibernate.version>
@@ -343,6 +343,7 @@
343343
<exclude>**/target/**</exclude>
344344
<exclude>**/nb-configuration.xml</exclude>
345345
<exclude>**/faces-config.NavData</exclude>
346+
<exclude>**/org.mockito.plugins.MockMaker</exclude>
346347
</excludes>
347348
</configuration>
348349
</plugin>
@@ -606,6 +607,13 @@
606607
<arg>-Xlint:deprecation</arg>
607608
<arg>-Xlint:unchecked</arg>
608609
</compilerArgs>
610+
<annotationProcessorPaths>
611+
<annotationProcessorPath>
612+
<groupId>org.aspectj</groupId>
613+
<artifactId>aspectjweaver</artifactId>
614+
<version>${aspectj.version}</version>
615+
</annotationProcessorPath>
616+
</annotationProcessorPaths>
609617
</configuration>
610618
</plugin>
611619
<plugin>
@@ -1075,6 +1083,16 @@
10751083
<version>2.1.0</version>
10761084
<scope>test</scope>
10771085
</dependency>
1086+
<dependency>
1087+
<groupId>net.bytebuddy</groupId>
1088+
<artifactId>byte-buddy</artifactId>
1089+
<version>${bytebuddy.version}</version>
1090+
</dependency>
1091+
<dependency>
1092+
<groupId>net.bytebuddy</groupId>
1093+
<artifactId>byte-buddy-agent</artifactId>
1094+
<version>${bytebuddy.version}</version>
1095+
</dependency>
10781096
<dependency>
10791097
<!-- used for the 'hashpass' command line tool: -->
10801098
<groupId>commons-cli</groupId>
@@ -1542,6 +1560,7 @@
15421560
<exclude>**/target/**</exclude>
15431561
<exclude>**/nb-configuration.xml</exclude>
15441562
<exclude>**/faces-config.NavData</exclude>
1563+
<exclude>**/org.mockito.plugins.MockMaker</exclude>
15451564
</excludes>
15461565
</configuration>
15471566
</plugin>

‎support/cdi/pom.xml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,6 @@
6868
<scope>test</scope>
6969
<optional>true</optional>
7070
</dependency>
71-
<dependency>
72-
<groupId>org.mockito</groupId>
73-
<artifactId>mockito-inline</artifactId>
74-
<version>${mockito-inline.version}</version>
75-
<scope>test</scope>
76-
<optional>true</optional>
77-
</dependency>
7871
<dependency>
7972
<groupId>org.slf4j</groupId>
8073
<artifactId>slf4j-jdk14</artifactId>
@@ -86,6 +79,18 @@
8679

8780
<build>
8881
<plugins>
82+
<plugin>
83+
<artifactId>maven-compiler-plugin</artifactId>
84+
<configuration>
85+
<annotationProcessorPaths>
86+
<annotationProcessorPath>
87+
<groupId>org.projectlombok</groupId>
88+
<artifactId>lombok</artifactId>
89+
<version>${lombok.version}</version>
90+
</annotationProcessorPath>
91+
</annotationProcessorPaths>
92+
</configuration>
93+
</plugin>
8994
<plugin>
9095
<groupId>org.apache.felix</groupId>
9196
<artifactId>maven-bundle-plugin</artifactId>

‎support/jakarta-ee/pom.xml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,6 @@
8787
<scope>test</scope>
8888
<optional>true</optional>
8989
</dependency>
90-
<dependency>
91-
<groupId>org.mockito</groupId>
92-
<artifactId>mockito-inline</artifactId>
93-
<version>${mockito-inline.version}</version>
94-
<scope>test</scope>
95-
<optional>true</optional>
96-
</dependency>
9790
<dependency>
9891
<groupId>org.slf4j</groupId>
9992
<artifactId>slf4j-jdk14</artifactId>
@@ -105,6 +98,18 @@
10598

10699
<build>
107100
<plugins>
101+
<plugin>
102+
<artifactId>maven-compiler-plugin</artifactId>
103+
<configuration>
104+
<annotationProcessorPaths>
105+
<annotationProcessorPath>
106+
<groupId>org.projectlombok</groupId>
107+
<artifactId>lombok</artifactId>
108+
<version>${lombok.version}</version>
109+
</annotationProcessorPath>
110+
</annotationProcessorPaths>
111+
</configuration>
112+
</plugin>
108113
<plugin>
109114
<groupId>org.apache.felix</groupId>
110115
<artifactId>maven-bundle-plugin</artifactId>

0 commit comments

Comments
 (0)