Skip to content

Commit 552c255

Browse files
committed
Adapt JDK version with drop Java 17 on 2.545 and April 2026 LTS release
1 parent d92ee33 commit 552c255

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

  • plugin-modernizer-core/src
    • main/java/io/jenkins/tools/pluginmodernizer/core/model
    • test/java/io/jenkins/tools/pluginmodernizer/core/model

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/model/JDK.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ public enum JDK {
2626
*/
2727
JAVA_8(8, true, null, "2.346.1", "1900.v9e128c991ef4"),
2828
JAVA_11(11, true, "2.164.1", "2.462.3", "2225.v04fa_3929c9b_5"),
29-
JAVA_17(17, true, "2.346.1", null, null),
29+
JAVA_17(17, true, "2.346.1", "2.544", null),
3030
JAVA_21(21, true, "2.426.1", null, null),
31-
JAVA_25(25, true, "2.479.1", null, null);
32-
// TODO: Update Java 25 compatible Since (jenkins version) if required
31+
JAVA_25(25, true, "2.541.1", null, null);
3332
/**
3433
* The major version
3534
*/

plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/model/JDKTest.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,24 @@ public void getBuildableJdk() {
158158
assertEquals(JDK.JAVA_17, JDK.get("2.463").get(0));
159159
assertEquals(JDK.JAVA_21, JDK.get("2.463").get(1));
160160

161-
assertEquals(3, JDK.get("2.479.1").size());
161+
assertEquals(2, JDK.get("2.479.1").size());
162162
assertEquals(JDK.JAVA_17, JDK.get("2.479.1").get(0));
163163
assertEquals(JDK.JAVA_21, JDK.get("2.479.1").get(1));
164164

165-
assertEquals(3, JDK.get("2.492.1").size());
165+
assertEquals(2, JDK.get("2.492.1").size());
166166
assertEquals(JDK.JAVA_17, JDK.get("2.492.1").get(0));
167167
assertEquals(JDK.JAVA_21, JDK.get("2.492.1").get(1));
168-
assertEquals(JDK.JAVA_25, JDK.get("2.492.1").get(2));
168+
169+
// Last LTS to support JDK 17
170+
assertEquals(3, JDK.get("2.541.1").size());
171+
assertEquals(JDK.JAVA_17, JDK.get("2.541.1").get(0));
172+
assertEquals(JDK.JAVA_21, JDK.get("2.541.1").get(1));
173+
assertEquals(JDK.JAVA_25, JDK.get("2.541.1").get(2));
174+
175+
// First LTS to drop JDK 17 (adapt when baseline is choosen)
176+
assertEquals(2, JDK.get("2.550.1").size());
177+
assertEquals(JDK.JAVA_21, JDK.get("2.550.1").get(0));
178+
assertEquals(JDK.JAVA_25, JDK.get("2.550.1").get(1));
169179
}
170180

171181
@Test

0 commit comments

Comments
 (0)