Merge branch '3.2.x' into 3.3.x

snicoll · snicoll · commit ff4b39a09668 · 2024-08-13T10:19:39.000+02:00
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
@@ -82,7 +82,8 @@ static Stream<JavaRuntime> javaRuntimes() {
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE));
 		javaRuntimes.add(JavaRuntime.oracleJdk17());
-		javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_TWO));
+		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));
+		javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_THREE));
 		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
@@ -110,7 +110,8 @@ static Stream<JavaRuntime> javaRuntimes() {
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE));
 		javaRuntimes.add(JavaRuntime.oracleJdk17());
-		javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_TWO));
+		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));
+		javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_THREE));
 		return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ static Stream<JavaRuntime> javaRuntimes() {`
`82`	`82`	`javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));`
`83`	`83`	`javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE));`
`84`	`84`	`javaRuntimes.add(JavaRuntime.oracleJdk17());`
`85`		`- javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_TWO));`
	`85`	`+ javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));`
	`86`	`+ javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_THREE));`
`86`	`87`	`return javaRuntimes.stream().filter(JavaRuntime::isCompatible);`
`87`	`88`	`}`
`88`	`89`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ static Stream<JavaRuntime> javaRuntimes() {`
`110`	`110`	`javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));`
`111`	`111`	`javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE));`
`112`	`112`	`javaRuntimes.add(JavaRuntime.oracleJdk17());`
`113`		`- javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_TWO));`
	`113`	`+ javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO));`
	`114`	`+ javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_THREE));`
`114`	`115`	`return javaRuntimes.stream().filter(JavaRuntime::isCompatible);`
`115`	`116`	`}`
`116`	`117`