Skip to content

Commit 37d104c

Browse files
committed
Build with Java 25
Drop build support of Java 11/17 Update spotless to support Java 25
1 parent 0a7f93e commit 37d104c

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

.github/workflows/maven.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030
strategy:
3131
matrix:
3232
os: [ubuntu-latest, macos-latest, windows-latest]
33-
jdk: [11, 17, 21]
33+
jdk: [21, 25]
3434
include:
3535
# lengthy build steps should only be performed on linux with Java 17 (Sonarcloud analysis, deployment)
3636
- os: ubuntu-latest
37-
jdk: 17
37+
jdk: 21
3838
isMainBuildEnv: true
3939
namePrefix: 'Main '
4040
fail-fast: false
@@ -83,7 +83,7 @@ jobs:
8383
fi
8484
- name: Set up Maven
8585
# https://maven.apache.org/wrapper/#using-a-different-version-of-maven
86-
run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper "-Dmaven=3.9.9"
86+
run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=3.9.11"
8787

8888
- name: ${{ matrix.namePrefix }} Build with Maven ${{ env.STEP_NAME_SUFFIX }}
8989
env:

pom.xml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@
210210
<plugin>
211211
<groupId>org.jacoco</groupId>
212212
<artifactId>jacoco-maven-plugin</artifactId>
213-
<version>0.8.12</version>
213+
<version>0.8.13</version>
214214
</plugin>
215215
<plugin>
216216
<artifactId>maven-invoker-plugin</artifactId>
217-
<version>3.7.0</version>
217+
<version>3.9.1</version>
218218
</plugin>
219219
</plugins>
220220
</pluginManagement>
@@ -231,8 +231,8 @@
231231
<configuration>
232232
<rules>
233233
<requireJavaVersion>
234-
<version>11</version>
235-
<!-- require at least Java 11 for building, but build for Java 8 -->
234+
<version>21</version>
235+
<!-- require at least Java 21 for building, but build for Java 8 -->
236236
</requireJavaVersion>
237237
<requireMavenVersion>
238238
<version>${maven.version}</version>
@@ -242,6 +242,15 @@
242242
</execution>
243243
</executions>
244244
</plugin>
245+
<plugin>
246+
<artifactId>maven-compiler-plugin</artifactId>
247+
<configuration>
248+
<annotationProcessors>
249+
<!-- generate META-INF/services-->
250+
<annotationProcessor>org.kohsuke.metainf_services.AnnotationProcessorImpl</annotationProcessor>
251+
</annotationProcessors>
252+
</configuration>
253+
</plugin>
245254
<plugin>
246255
<groupId>org.apache.maven.plugins</groupId>
247256
<artifactId>maven-invoker-plugin</artifactId>
@@ -296,7 +305,7 @@
296305
<!-- orders of used formatters are important MPOM-376 -->
297306
<!-- eg. palantir override importOrder, so should be first -->
298307
<palantirJavaFormat>
299-
<version>2.58.0</version>
308+
<version>2.76.0</version>
300309
</palantirJavaFormat>
301310
<removeUnusedImports />
302311
<importOrder>

0 commit comments

Comments
 (0)