Skip to content
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ properties([

def axes = [
platforms: ['linux', 'windows'],
jdks: [17, 21],
jdks: [17, 21, 25],
]

stage('Record build') {
Expand All @@ -34,7 +34,7 @@ stage('Record build') {
sh "launchable verify && launchable record build --name ${launchableName} --source jenkinsci/jenkins=."
axes.values().combinations {
def (platform, jdk) = it
if (platform == 'windows' && jdk != 17) {
if (platform == 'windows' && jdk != axes.jdks.last()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reduces the manual effort to maintain this and decide which one to put

return // unnecessary use of hardware
}
def sessionFile = "launchable-session-${platform}-jdk${jdk}.txt"
Expand All @@ -60,7 +60,7 @@ def builds = [:]

axes.values().combinations {
def (platform, jdk) = it
if (platform == 'windows' && jdk != 17) {
if (platform == 'windows' && jdk != axes.jdks.last()) {
return // unnecessary use of hardware
}
builds["${platform}-jdk${jdk}"] = {
Expand Down
2 changes: 1 addition & 1 deletion war/src/main/java/executable/Main.java
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));
private static final NavigableSet<Integer> SUPPORTED_JAVA_VERSIONS = new TreeSet<>(List.of(17, 21, 25));

/**
* Sets custom session cookie name.
Expand Down
Loading