Skip to content

Commit 2c0e0b9

Browse files
committed
build: Ensure compatibility with newer Java versions
Java changed the way how it processes annotations: ``` As of JDK 23, annotation processing is only run with some explicit configuration of annotation processing or with an explicit request to run annotation processing on the javac command line. ``` this messes with lombok, this compiler configuration will change the default behavior, so it works with java 23 Signed-off-by: Simon Schrottner <[email protected]>
1 parent 46f0c7b commit 2c0e0b9

File tree

4 files changed

+34
-26
lines changed

4 files changed

+34
-26
lines changed

Diff for: .github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
os: [ubuntu-latest]
1616
build:
17-
- java: 17
17+
- java: 21
1818
profile: codequality
1919
- java: 8
2020
profile: java8

Diff for: .github/workflows/release-please.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
if: ${{ steps.release.outputs.releases_created }}
2020
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2121

22-
- name: Set up JDK 17
22+
- name: Set up JDK 21
2323
if: ${{ steps.release.outputs.releases_created }}
2424
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
2525
with:
26-
java-version: '17'
26+
java-version: '21'
2727
distribution: 'temurin'
2828
cache: maven
2929
server-id: ossrh

Diff for: pom.xml

+31-22
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,10 @@
4949
</scm>
5050

5151
<properties>
52-
<toolchain.jdk.version>[17,)</toolchain.jdk.version>
53-
<junit.jupiter.version>5.11.4</junit.jupiter.version>
52+
<toolchain.jdk.version>[21,)</toolchain.jdk.version>
5453
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5554
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5655
<module-name>${groupId}.${artifactId}</module-name>
57-
<io.cucumber.version>7.21.1</io.cucumber.version>
58-
<org.mockito.version>5.2.0</org.mockito.version>
5956
<javadoc.failOnWarnings>true</javadoc.failOnWarnings>
6057
<!-- This is required for later correct replacement of surefireArgLine -->
6158
<!-- see surefire-java8 and surefire-java9+ profiles -->
@@ -65,9 +62,35 @@
6562
</surefireArgLine>
6663
<skip.tests>false</skip.tests>
6764
<!-- this will throw an error if we use APIs not available in the specified version -->
68-
<maven.compiler.release>8</maven.compiler.release>
65+
<maven.compiler.release>8</maven.compiler.release>
6966
</properties>
7067

68+
<dependencyManagement>
69+
<dependencies>
70+
<dependency>
71+
<groupId>org.junit</groupId>
72+
<artifactId>junit-bom</artifactId>
73+
<version>5.12.0</version>
74+
<type>pom</type>
75+
<scope>import</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>io.cucumber</groupId>
79+
<artifactId>cucumber-bom</artifactId>
80+
<version>7.21.1</version>
81+
<type>pom</type>
82+
<scope>import</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.mockito</groupId>
86+
<artifactId>mockito-bom</artifactId>
87+
<version>5.15.2</version>
88+
<type>pom</type>
89+
<scope>import</scope>
90+
</dependency>
91+
</dependencies>
92+
</dependencyManagement>
93+
7194
<dependencies>
7295
<dependency>
7396
<!-- provided -->
@@ -101,7 +124,6 @@
101124
<dependency>
102125
<groupId>org.mockito</groupId>
103126
<artifactId>mockito-core</artifactId>
104-
<version>${org.mockito.version}</version>
105127
<scope>test</scope>
106128
</dependency>
107129

@@ -140,35 +162,30 @@
140162
<dependency>
141163
<groupId>org.junit.jupiter</groupId>
142164
<artifactId>junit-jupiter</artifactId>
143-
<version>${junit.jupiter.version}</version>
144165
<scope>test</scope>
145166
</dependency>
146167

147168
<dependency>
148169
<groupId>org.junit.jupiter</groupId>
149170
<artifactId>junit-jupiter-engine</artifactId>
150-
<version>${junit.jupiter.version}</version>
151171
<scope>test</scope>
152172
</dependency>
153173

154174
<dependency>
155175
<groupId>org.junit.jupiter</groupId>
156176
<artifactId>junit-jupiter-api</artifactId>
157-
<version>${junit.jupiter.version}</version>
158177
<scope>test</scope>
159178
</dependency>
160179

161180
<dependency>
162181
<groupId>org.junit.jupiter</groupId>
163182
<artifactId>junit-jupiter-params</artifactId>
164-
<version>${junit.jupiter.version}</version>
165183
<scope>test</scope>
166184
</dependency>
167185

168186
<dependency>
169187
<groupId>org.junit.platform</groupId>
170188
<artifactId>junit-platform-suite</artifactId>
171-
<version>1.11.4</version>
172189
<scope>test</scope>
173190
</dependency>
174191

@@ -182,35 +199,24 @@
182199
<dependency>
183200
<groupId>org.mockito</groupId>
184201
<artifactId>mockito-junit-jupiter</artifactId>
185-
<version>5.15.2</version>
186-
<scope>test</scope>
187-
</dependency>
188-
189-
<dependency>
190-
<groupId>org.mockito</groupId>
191-
<artifactId>mockito-inline</artifactId>
192-
<version>${org.mockito.version}</version>
193202
<scope>test</scope>
194203
</dependency>
195204

196205
<dependency>
197206
<groupId>io.cucumber</groupId>
198207
<artifactId>cucumber-java</artifactId>
199-
<version>${io.cucumber.version}</version>
200208
<scope>test</scope>
201209
</dependency>
202210

203211
<dependency>
204212
<groupId>io.cucumber</groupId>
205213
<artifactId>cucumber-junit-platform-engine</artifactId>
206-
<version>${io.cucumber.version}</version>
207214
<scope>test</scope>
208215
</dependency>
209216

210217
<dependency>
211218
<groupId>io.cucumber</groupId>
212219
<artifactId>cucumber-picocontainer</artifactId>
213-
<version>${io.cucumber.version}</version>
214220
<scope>test</scope>
215221
</dependency>
216222

@@ -401,6 +407,9 @@
401407
<activation>
402408
<activeByDefault>true</activeByDefault>
403409
</activation>
410+
<properties>
411+
<maven.compiler.proc>full</maven.compiler.proc>
412+
</properties>
404413
<build>
405414
<plugins>
406415
<!-- CODE QUALITY TOOLS -->

Diff for: tools/junit-openfeature/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<dependency>
3636
<groupId>org.junit.jupiter</groupId>
3737
<artifactId>junit-jupiter-api</artifactId>
38-
<version>${junit.jupiter.version}</version>
3938
</dependency>
4039

4140
<dependency>

0 commit comments

Comments
 (0)