Skip to content

Commit 72291de

Browse files
committed
Updating CircleCI to use LTS JDKs
1 parent 570a55a commit 72291de

File tree

2 files changed

+38
-11
lines changed

2 files changed

+38
-11
lines changed

.circleci/config.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,27 @@ jobs:
3030
<<: *default_steps
3131
openjdk8:
3232
docker: &jdk8
33-
- image: circleci/openjdk:8u242
34-
<<: *default_steps
35-
openjdk9:
36-
docker:
37-
- image: circleci/openjdk:9.0.4-12
33+
- image: cimg/openjdk:8.0
3834
<<: *default_steps
3935
openjdk11:
4036
docker:
41-
- image: circleci/openjdk:11.0.2
37+
- image: cimg/openjdk:11.0
4238
<<: *default_steps
4339
openjdk13:
4440
docker:
45-
- image: circleci/openjdk:13.0.2-buster
41+
- image: cimg/openjdk:13.0
4642
<<: *default_steps
47-
openjdk14:
43+
openjdk17:
4844
docker:
49-
- image: circleci/openjdk:14.0.2-buster
45+
- image: cimg/openjdk:17.0
5046
<<: *default_steps
47+
48+
## Fails with "Source option 7 is no longer supported. Use 8 or later."
49+
# openjdk21:
50+
# docker:
51+
# - image: cimg/openjdk:21.0
52+
# <<: *default_steps
53+
5154
windows-openjdk12:
5255
executor: win/default
5356
steps:
@@ -75,9 +78,10 @@ workflows:
7578
jobs:
7679
- openjdk7
7780
- openjdk8
78-
- openjdk9
7981
- openjdk11
8082
- openjdk13
83+
- openjdk17
84+
# - openjdk21
8185
- windows-openjdk12
8286
- openjdk8-jnr-exclude
8387
- openjdk8-jnr-latest

pom.xml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,27 @@
159159
</dependency>
160160
</dependencies>
161161
</profile>
162+
<profile>
163+
<id>new-jdks</id>
164+
<activation>
165+
<jdk>[16.0,)</jdk>
166+
</activation>
167+
<build>
168+
<plugins>
169+
<plugin>
170+
<groupId>org.apache.maven.plugins</groupId>
171+
<artifactId>maven-surefire-plugin</artifactId>
172+
<version>2.19</version>
173+
<configuration>
174+
<!-- Fix for "java.lang.reflect.InaccessibleObjectException: Unable to make field private final java.util.Map java.util.Collections$UnmodifiableMap.m accessible: module java.base does not "opens java.util" to unnamed module @75eeccf5" -->
175+
<argLine>
176+
--add-opens=java.base/java.util=ALL-UNNAMED
177+
</argLine>
178+
</configuration>
179+
</plugin>
180+
</plugins>
181+
</build>
182+
</profile>
162183
</profiles>
163184

164185
<dependencies>
@@ -215,6 +236,7 @@
215236
<plugin>
216237
<groupId>org.apache.maven.plugins</groupId>
217238
<artifactId>maven-enforcer-plugin</artifactId>
239+
<!-- Can't use 3.4.1 as that needs Maven 3.2.5 -->
218240
<version>3.0.0-M2</version>
219241
<executions>
220242
<execution>
@@ -225,7 +247,7 @@
225247
<configuration>
226248
<rules>
227249
<requireJavaVersion>
228-
<version>[1.7.0-0,1.9.0-0),[9.0.0,13.0.14]</version>
250+
<version>[1.7.0-0,1.9.0-0),[9.0,18.0-0)</version>
229251
</requireJavaVersion>
230252
</rules>
231253
</configuration>
@@ -323,6 +345,7 @@
323345
<plugin>
324346
<groupId>org.apache.maven.plugins</groupId>
325347
<artifactId>maven-deploy-plugin</artifactId>
348+
<version>3.1.1</version>
326349
<configuration>
327350
<skip>true</skip>
328351
</configuration>

0 commit comments

Comments
 (0)