Skip to content

Commit 3540e93

Browse files
uhafnerNotMyFaulttimja
authored andcommitted
Require Java 21 or newer (#26018)
Co-authored-by: Alexander Brandes <mc.cache@web.de> Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> (cherry picked from commit 5312d24)
1 parent acc742d commit 3540e93

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public class JavaVersionRecommendationAdminMonitor extends AdministrativeMonitor
7878

7979
static {
8080
NavigableMap<Integer, LocalDate> supportedVersions = new TreeMap<>();
81-
supportedVersions.put(17, LocalDate.of(2026, 3, 31)); // Temurin: 2027-10-31
8281
supportedVersions.put(21, LocalDate.of(2027, 9, 30)); // Temurin: 2029-09-30
8382
SUPPORTED_JAVA_VERSIONS = Collections.unmodifiableNavigableMap(supportedVersions);
8483
}

core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ private void loadWhitelist(@NonNull List<String> whitelistLines) {
311311
}
312312
}
313313

314-
@SuppressFBWarnings(value = "SIC_INNER_SHOULD_BE_STATIC", justification = "TODO needs triage")
315314
private class Validator {
316315
// lazy load parents to avoid trying to load potentially unavailable classes
317316
private final Supplier<Collection<Validator>> parentsSupplier;

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ THE SOFTWARE.
2828
<parent>
2929
<groupId>org.jenkins-ci</groupId>
3030
<artifactId>jenkins</artifactId>
31-
<version>1.142</version>
31+
<version>2.1326.v00b_e26755312</version>
3232
<relativePath />
3333
</parent>
3434

war/src/main/java/executable/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class Main {
7676
* This list must remain synchronized with the one in {@code
7777
* JavaVersionRecommendationAdminMonitor}.
7878
*/
79-
private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(17, 21, 25));
79+
private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(21, 25));
8080

8181
/**
8282
* Sets custom session cookie name.

war/src/test/java/executable/MainTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ void unsupported() {
1313
assertJavaCheckFails(8, true);
1414
assertJavaCheckFails(11, false);
1515
assertJavaCheckFails(11, true);
16+
assertJavaCheckFails(17, false);
17+
assertJavaCheckFails(17, true);
1618
}
1719

1820
@Test
1921
void supported() {
20-
assertJavaCheckPasses(17, false);
21-
assertJavaCheckPasses(17, true);
2222
assertJavaCheckPasses(21, false);
2323
assertJavaCheckPasses(21, true);
24+
assertJavaCheckPasses(25, false);
25+
assertJavaCheckPasses(25, true);
2426
}
2527

2628
@Test
2729
void future() {
28-
assertJavaCheckFails(18, false);
29-
assertJavaCheckFails(19, false);
30-
assertJavaCheckFails(20, false);
3130
assertJavaCheckFails(22, false);
32-
assertJavaCheckPasses(18, true);
33-
assertJavaCheckPasses(19, true);
34-
assertJavaCheckPasses(20, true);
31+
assertJavaCheckFails(23, false);
32+
assertJavaCheckFails(24, false);
3533
assertJavaCheckPasses(22, true);
34+
assertJavaCheckPasses(23, true);
35+
assertJavaCheckPasses(24, true);
3636
}
3737

3838
private static void assertJavaCheckFails(int releaseVersion, boolean enableFutureJava) {

0 commit comments

Comments
 (0)