Revert "Merge branch '2.4.x'"

This reverts commit 97b26b4886, reversing
changes made to 6f9b1ed6a3.

See gh-25840

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

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

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

@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
-	builder = "springci/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,6 +7,5 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
-	builder = "springci/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-buildsImageWithCommandLineOptions.gradle

@@ -1,7 +0,0 @@
-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 = "springci/spring-boot-cnb-builder:0.0.1"
-	runImage = "paketobuildpacks/run:tiny-cnb"
+	builder = "paketobuildpacks/builder:full"
+	runImage = "paketobuildpacks/run:full-cnb"
 }

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

@@ -8,5 +8,4 @@ targetCompatibility = '1.8'
 
 bootBuildImage {
 	imageName = "example/test-image-name"
-	builder = "springci/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,7 +9,3 @@ bootBuildImage {
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
-
-bootBuildImage {
-	builder = "springci/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-failsWithBindingContainingInvalidCertificate.gradle

@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
-	builder = "springci/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-failsWithBuilderError.gradle

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

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

@@ -7,6 +7,5 @@ sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
-	builder = "springci/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.gradle

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