Merge branch '4.0.x'

smoke-test/spring-boot-smoke-test-restclient/src/test/java/smoketest/restclient/SampleRestClientApplicationGh49223Tests.java

@@ -17,7 +17,6 @@
 package smoketest.restclient;
 
 import java.util.List;
-import java.util.Objects;
 
 import org.junit.jupiter.api.Test;
 import tools.jackson.databind.DeserializationFeature;
@@ -39,8 +38,8 @@ class SampleRestClientApplicationGh49223Tests {
 	@Test
 	void applicationStarts() {
 		RestClient restClient = this.restClientBuilder.build();
-		List<?> messageConverters = (List<?>) Objects
-			.requireNonNull(ReflectionTestUtils.getField(restClient, "messageConverters"));
+		List<?> messageConverters = (List<?>) ReflectionTestUtils.getField(restClient, "messageConverters");
+		assertThat(messageConverters).isNotNull();
 		JacksonJsonHttpMessageConverter jacksonConverter = (JacksonJsonHttpMessageConverter) messageConverters.stream()
 			.filter((converter) -> converter instanceof JacksonJsonHttpMessageConverter)
 			.findFirst()

system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle

@@ -56,5 +56,6 @@ application {
 bootBuildImage {
 	archiveFile = distZip.archiveFile
 	runImage = "paketobuildpacks/ubuntu-noble-run:latest"
+	imagePlatform = "linux/amd64"
 	environment = ['BP_JVM_VERSION': java.targetCompatibility.getMajorVersion()]
 }

system-test/spring-boot-image-system-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle

@@ -48,6 +48,7 @@ war {
 bootBuildImage {
 	archiveFile = war.archiveFile
 	runImage = "paketobuildpacks/ubuntu-noble-run:latest"
+	imagePlatform = "linux/amd64"
 	environment = [
 		'BP_JVM_VERSION': java.targetCompatibility.getMajorVersion(),
 		'BP_TOMCAT_VERSION': '11.*',