Use Java 25 in loader integration tests

snicoll · snicoll · commit 50f890bff249 · 2025-10-15T08:38:16.000+02:00
See gh-47609
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
@@ -92,7 +92,8 @@ static Stream<JavaRuntime> javaRuntimes() {
 		javaRuntimes.add(JavaRuntime.oracleJdk17());
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_THREE));
-		javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_FOUR));
+		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FOUR));
+		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FIVE));
 		return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
 	}
 
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
@@ -120,7 +120,8 @@ static Stream<JavaRuntime> javaRuntimes() {
 		javaRuntimes.add(JavaRuntime.oracleJdk17());
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_THREE));
-		javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_FOUR));
+		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FOUR));
+		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FIVE));
 		return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ static Stream<JavaRuntime> javaRuntimes() {`
`92`	`92`	`javaRuntimes.add(JavaRuntime.oracleJdk17());`
`93`	`93`	`javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));`
`94`	`94`	`javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_THREE));`
`95`		`- javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_FOUR));`
	`95`	`+ javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FOUR));`
	`96`	`+ javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FIVE));`
`96`	`97`	`return javaRuntimes.stream().filter(JavaRuntime::isCompatible);`
`97`	`98`	`}`
`98`	`99`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@ static Stream<JavaRuntime> javaRuntimes() {`
`120`	`120`	`javaRuntimes.add(JavaRuntime.oracleJdk17());`
`121`	`121`	`javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));`
`122`	`122`	`javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_THREE));`
`123`		`- javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_FOUR));`
	`123`	`+ javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FOUR));`
	`124`	`+ javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FIVE));`
`124`	`125`	`return javaRuntimes.stream().filter(JavaRuntime::isCompatible);`
`125`	`126`	`}`
`126`	`127`