diff --git a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java index 3cdbfa4a02..712c957d85 100644 --- a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java +++ b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java @@ -78,7 +78,6 @@ public class JavaVersionRecommendationAdminMonitor extends AdministrativeMonitor static { NavigableMap supportedVersions = new TreeMap<>(); - supportedVersions.put(17, LocalDate.of(2026, 3, 31)); // Temurin: 2027-10-31 supportedVersions.put(21, LocalDate.of(2027, 9, 30)); // Temurin: 2029-09-30 supportedVersions.put(25, LocalDate.of(2029, 9, 30)); // Temurin: 2031-09-30 SUPPORTED_JAVA_VERSIONS = Collections.unmodifiableNavigableMap(supportedVersions); diff --git a/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java b/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java index 6da06ad841..028b2dba1d 100644 --- a/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java +++ b/core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java @@ -311,7 +311,6 @@ public class StaplerDispatchValidator implements DispatchValidator { } } - @SuppressFBWarnings(value = "SIC_INNER_SHOULD_BE_STATIC", justification = "TODO needs triage") private class Validator { // lazy load parents to avoid trying to load potentially unavailable classes private final Supplier> parentsSupplier; diff --git a/pom.xml b/pom.xml index f78ed0c869..28aa55ef31 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci jenkins - 1.142 + 2.1326.v00b_e26755312 diff --git a/war/src/main/java/executable/Main.java b/war/src/main/java/executable/Main.java index 2eeed2622d..70411a6352 100644 --- a/war/src/main/java/executable/Main.java +++ b/war/src/main/java/executable/Main.java @@ -76,7 +76,7 @@ public class Main { * This list must remain synchronized with the one in {@code * JavaVersionRecommendationAdminMonitor}. */ - private static final NavigableSet SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(17, 21, 25)); + private static final NavigableSet SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(21, 25)); /** * Sets custom session cookie name. diff --git a/war/src/test/java/executable/MainTest.java b/war/src/test/java/executable/MainTest.java index 106b835ac3..a7b28a5b08 100644 --- a/war/src/test/java/executable/MainTest.java +++ b/war/src/test/java/executable/MainTest.java @@ -13,26 +13,26 @@ class MainTest { assertJavaCheckFails(8, true); assertJavaCheckFails(11, false); assertJavaCheckFails(11, true); + assertJavaCheckFails(17, false); + assertJavaCheckFails(17, true); } @Test void supported() { - assertJavaCheckPasses(17, false); - assertJavaCheckPasses(17, true); assertJavaCheckPasses(21, false); assertJavaCheckPasses(21, true); + assertJavaCheckPasses(25, false); + assertJavaCheckPasses(25, true); } @Test void future() { - assertJavaCheckFails(18, false); - assertJavaCheckFails(19, false); - assertJavaCheckFails(20, false); assertJavaCheckFails(22, false); - assertJavaCheckPasses(18, true); - assertJavaCheckPasses(19, true); - assertJavaCheckPasses(20, true); + assertJavaCheckFails(23, false); + assertJavaCheckFails(24, false); assertJavaCheckPasses(22, true); + assertJavaCheckPasses(23, true); + assertJavaCheckPasses(24, true); } private static void assertJavaCheckFails(int releaseVersion, boolean enableFutureJava) {