diff --git a/Jenkinsfile b/Jenkinsfile index 34a625c..1be0a79 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,6 +4,6 @@ * allowing one to test against multiple Jenkins versions. */ buildPlugin(useContainerAgent: true, configurations: [ - [ platform: 'windows', jdk: '17' ], - [ platform: 'linux', jdk: '21' ] + [ platform: 'linux', jdk: 25 ], + [ platform: 'windows', jdk: 21 ] ]) diff --git a/pom.xml b/pom.xml index 6da1903..d3f87fb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci jenkins - 1.142 + 2.1326.v00b_e26755312 diff --git a/src/main/java/io/jenkins/lib/versionnumber/JavaSpecificationVersion.java b/src/main/java/io/jenkins/lib/versionnumber/JavaSpecificationVersion.java index 5017407..3b4feab 100644 --- a/src/main/java/io/jenkins/lib/versionnumber/JavaSpecificationVersion.java +++ b/src/main/java/io/jenkins/lib/versionnumber/JavaSpecificationVersion.java @@ -75,6 +75,11 @@ public class JavaSpecificationVersion extends VersionNumber { releaseToClass.put(18, 62); releaseToClass.put(19, 63); releaseToClass.put(20, 64); + releaseToClass.put(21, 65); + releaseToClass.put(22, 66); + releaseToClass.put(23, 67); + releaseToClass.put(24, 68); + releaseToClass.put(25, 69); RELEASE_TO_CLASS = Collections.unmodifiableNavigableMap(releaseToClass); NavigableMap classToRelease = new TreeMap<>(); diff --git a/src/test/java/io/jenkins/lib/versionnumber/JavaSpecificationVersionTest.java b/src/test/java/io/jenkins/lib/versionnumber/JavaSpecificationVersionTest.java index 09d4166..2eedc1c 100644 --- a/src/test/java/io/jenkins/lib/versionnumber/JavaSpecificationVersionTest.java +++ b/src/test/java/io/jenkins/lib/versionnumber/JavaSpecificationVersionTest.java @@ -79,6 +79,12 @@ void shouldRetrieveSpecVersionForTheCurrentJVM() { assertNotNull(JavaSpecificationVersion.forCurrentJVM()); } + @Test + void shouldRetrieveClassVersionForTheCurrentJVM() { + // Library no longer supports Java versions before 21 + assertTrue(JavaSpecificationVersion.forCurrentJVM().toClassVersion() >= 21); + } + @Test void invalidVersions() { assertThrows(NumberFormatException.class, () -> new JavaSpecificationVersion("1.1.1"));