Merge branch '3.4.x'

Closes gh-44213

Author: wilkinsona

.github/workflows/ci.yml

@@ -25,6 +25,9 @@ jobs:
             toolchain: false
           - version: 23
             toolchain: true
+          - version: 24
+            early-access: true
+            toolchain: true
         exclude:
           - os:
               name: Linux

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

@@ -154,3 +154,7 @@ plugins.withType(EclipsePlugin) {
 		}
 	}
 }
+
+toolchain {
+	maximumCompatibleJavaVersion = JavaLanguageVersion.of(23)
+}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java

@@ -44,6 +44,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 import org.mockito.InOrder;
 
 import org.springframework.boot.testsupport.web.servlet.ExampleServlet;
@@ -308,6 +310,7 @@ void sslRestrictedProtocolsECDHESuccess() throws Exception {
 	}
 
 	@Test
+	@DisabledForJreRange(min = JRE.JAVA_24)
 	void sslRestrictedProtocolsRSATLS12Success() throws Exception {
 		testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1.2" },
 				new String[] { "TLS_RSA_WITH_AES_128_CBC_SHA256" });

spring-boot-system-tests/spring-boot-image-tests/build.gradle

@@ -42,3 +42,7 @@ dependencies {
 	systemTestImplementation("org.testcontainers:junit-jupiter")
 	systemTestImplementation("org.testcontainers:testcontainers")
 }
+
+toolchain {
+	maximumCompatibleJavaVersion = JavaLanguageVersion.of(23)
+}

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java

@@ -67,7 +67,18 @@ private GenericContainer<?> createContainer(JavaRuntime javaRuntime) {
 			.withLogConsumer(this.output)
 			.withCopyFileToContainer(MountableFile.forHostPath(findApplication().toPath()), "/app.jar")
 			.withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)))
-			.withCommand("java", "-jar", "app.jar");
+			.withCommand(command(javaRuntime));
+	}
+
+	private String[] command(JavaRuntime javaRuntime) {
+		List<String> command = new ArrayList<>();
+		command.add("java");
+		if (javaRuntime.version == JavaVersion.TWENTY_FOUR) {
+			command.add("--enable-native-access=ALL-UNNAMED");
+		}
+		command.add("-jar");
+		command.add("app.jar");
+		return command.toArray(new String[0]);
 	}
 
 	private File findApplication() {
@@ -84,6 +95,7 @@ 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));
 		return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
 	}
 

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java

@@ -90,7 +90,18 @@ private GenericContainer<?> createContainer(JavaRuntime javaRuntime, String name
 			.withLogConsumer(this.output)
 			.withCopyFileToContainer(findApplication(name, classifier), "/app.jar")
 			.withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)))
-			.withCommand("java", "-jar", "app.jar");
+			.withCommand(command(javaRuntime));
+	}
+
+	private String[] command(JavaRuntime javaRuntime) {
+		List<String> command = new ArrayList<>();
+		command.add("java");
+		if (javaRuntime.version == JavaVersion.TWENTY_FOUR) {
+			command.add("--enable-native-access=ALL-UNNAMED");
+		}
+		command.add("-jar");
+		command.add("app.jar");
+		return command.toArray(new String[0]);
 	}
 
 	private MountableFile findApplication(String name, String classifier) {
@@ -112,6 +123,7 @@ 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));
 		return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
 	}