Merge branch '2.4.x'

Closes gh-25840

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBinding.gradle

@@ -7,5 +7,6 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	bindings = [ "${projectDir}/bindings/ca-certificates:/platform/bindings/certificates" ]
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromBuilder.gradle

@@ -7,5 +7,6 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
-	buildpacks = [ "paketo-buildpacks/java" ]
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
+	buildpacks = [ "spring-boot/test-info" ]
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromDirectory.gradle

@@ -7,5 +7,6 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildpacks = [ "file://${projectDir}/buildpack/hello-world" ]
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpackFromTarGzip.gradle

@@ -7,5 +7,6 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildpacks = [ "file://${projectDir}/hello-world.tgz" ]
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithBuildpacksFromImages.gradle

@@ -7,7 +7,6 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
-	buildpacks = ["gcr.io/paketo-buildpacks/bellsoft-liberica:latest",
-				  "gcr.io/paketo-buildpacks/executable-jar:latest",
-				  "gcr.io/paketo-buildpacks/spring-boot:latest"]
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
+	buildpacks = ["projects.registry.vmware.com/springboot/test-info:latest"]
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCommandLineOptions.gradle

@@ -0,0 +1,7 @@
+plugins {
+	id 'java'
+	id 'org.springframework.boot' version '{version}'
+}
+
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomBuilderAndRunImage.gradle

@@ -8,6 +8,6 @@ targetCompatibility = '1.8'
 
 bootBuildImage {
 	imageName = "example/test-image-custom"
-	builder = "paketobuildpacks/builder:full"
-	runImage = "paketobuildpacks/run:full-cnb"
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
+	runImage = "projects.registry.vmware.com/springboot/run:tiny-cnb"
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithCustomName.gradle

@@ -8,4 +8,5 @@ targetCompatibility = '1.8'
 
 bootBuildImage {
 	imageName = "example/test-image-name"
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle

@@ -9,3 +9,7 @@ bootBuildImage {
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
+
+bootBuildImage {
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
+}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuilderError.gradle

@@ -7,5 +7,6 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
-	environment = ["BP_JVM_VERSION": "13.9.9"]
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
+	environment = ["FORCE_FAILURE": "true"]
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithBuildpackNotInBuilder.gradle

@@ -7,5 +7,6 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
 	buildpacks = [ "urn:cnb:builder:example/does-not-exist:0.0.1" ]
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithLaunchScript.gradle

@@ -8,4 +8,8 @@ targetCompatibility = '1.8'
 
 bootJar {
 	launchScript()
-}
+}
+
+bootBuildImage {
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
+}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.gradle

@@ -9,3 +9,7 @@ if (project.hasProperty('applyWarPlugin')) {
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
+
+bootBuildImage {
+	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
+}