Skip to content

Require Java 21 or newer #26018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotMyFault merged 4 commits into from
Jan 3, 2026
Merged

Require Java 21 or newer #26018

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7babab1
Require Java 21 or newer
uhafner Dec 30, 2025
442e9fd
Do not change the war POM so that users get an error message
uhafner Jan 1, 2026
3df888d
Update parent pom to require Java 21
NotMyFault Jan 2, 2026
6ec87b5
Update StaplerDispatchValidator.java
timja Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public class JavaVersionRecommendationAdminMonitor extends AdministrativeMonitor

static {
NavigableMap<Integer, LocalDate> 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);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci</groupId>
<artifactId>jenkins</artifactId>
<version>1.142</version>
<version>2.1326.v00b_e26755312</version>
<relativePath />
</parent>

Expand Down
2 changes: 1 addition & 1 deletion war/src/main/java/executable/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class Main {
* This list must remain synchronized with the one in {@code
* JavaVersionRecommendationAdminMonitor}.
*/
private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(17, 21, 25));
private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(21, 25));

/**
* Sets custom session cookie name.
Expand Down
16 changes: 8 additions & 8 deletions war/src/test/java/executable/MainTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ void unsupported() {
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) {
Expand Down
Loading