Merge branch '3.0.x' into 3.1.x

Closes gh-37518

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

@@ -37,6 +37,7 @@ application {
 }
 
 bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
 	archiveFile = bootDistZip.archiveFile
 	environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion()]
 }

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

@@ -32,3 +32,7 @@ bootWar {
 		)
 	}
 }
+
+bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
+}

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

@@ -34,5 +34,6 @@ bootJar {
 }
 
 bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
 	environment = ['BP_NATIVE_IMAGE': 'true']
 }

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

@@ -37,6 +37,7 @@ application {
 }
 
 bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
 	archiveFile = distZip.archiveFile
 	environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion()]
 }

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

@@ -30,6 +30,7 @@ war {
 }
 
 bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
 	archiveFile = war.archiveFile
 	environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion(), 'BP_TOMCAT_VERSION': '10.*']
 }

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

@@ -30,3 +30,7 @@ bootJar {
 		)
 	}
 }
+
+bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
+}