Merge branch '3.5.x'

snicoll · snicoll · commit 712389b2ea86 · 2025-10-15T08:45:03.000+02:00
diff --git a/integration-test/spring-boot-loader-integration-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/integration-test/spring-boot-loader-integration-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
`@@ -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`