Revert "Merge branch '2.3.x' into 2.4.x"

This reverts commit 586ce00e, reversing
changes made to 563b8a8c.

See gh-25839

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

 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,8 @@ import java.util.Random;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.TaskOutcome;
 import org.junit.jupiter.api.TestTemplate;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 
 import org.springframework.boot.buildpack.platform.docker.DockerApi;
 import org.springframework.boot.buildpack.platform.docker.type.ImageName;
@@ -58,10 +60,13 @@ class BootBuildImageIntegrationTests {
 		String projectName = this.gradleBuild.getProjectDir().getName();
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
-		assertThat(result.getOutput()).contains("---> Test Info buildpack building");
-		assertThat(result.getOutput()).contains("env: BP_JVM_VERSION=8.*");
-		assertThat(result.getOutput()).contains("---> Test Info buildpack done");
-		removeImage(projectName);
+		ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
+		try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+			container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+		}
+		finally {
+			new DockerApi().image().remove(imageReference, false);
+		}
 	}
 
 	@TestTemplate
@@ -71,10 +76,13 @@ class BootBuildImageIntegrationTests {
 		BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		assertThat(result.getOutput()).contains("example/test-image-name");
-		assertThat(result.getOutput()).contains("---> Test Info buildpack building");
-		assertThat(result.getOutput()).contains("env: BP_JVM_VERSION=8.*");
-		assertThat(result.getOutput()).contains("---> Test Info buildpack done");
-		removeImage("example/test-image-name");
+		ImageReference imageReference = ImageReference.of(ImageName.of("example/test-image-name"));
+		try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+			container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+		}
+		finally {
+			new DockerApi().image().remove(imageReference, false);
+		}
 	}
 
 	@TestTemplate
@@ -84,9 +92,13 @@ class BootBuildImageIntegrationTests {
 		BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		assertThat(result.getOutput()).contains("example/test-image-custom");
-		assertThat(result.getOutput()).contains("---> Test Info buildpack building");
-		assertThat(result.getOutput()).contains("---> Test Info buildpack done");
-		removeImage("example/test-image-custom");
+		ImageReference imageReference = ImageReference.of(ImageName.of("example/test-image-custom"));
+		try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+			container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+		}
+		finally {
+			new DockerApi().image().remove(imageReference, false);
+		}
 	}
 
 	@TestTemplate
@@ -94,13 +106,17 @@ class BootBuildImageIntegrationTests {
 		writeMainClass();
 		writeLongNameResource();
 		BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT",
-				"--imageName=example/test-image-cmd", "--builder=springci/spring-boot-cnb-builder:0.0.1",
-				"--runImage=paketobuildpacks/run:tiny-cnb");
+				"--imageName=example/test-image-cmd", "--builder=paketobuildpacks/builder:full",
+				"--runImage=paketobuildpacks/run:full-cnb");
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		assertThat(result.getOutput()).contains("example/test-image-cmd");
-		assertThat(result.getOutput()).contains("---> Test Info buildpack building");
-		assertThat(result.getOutput()).contains("---> Test Info buildpack done");
-		removeImage("example/test-image-cmd");
+		ImageReference imageReference = ImageReference.of(ImageName.of("example/test-image-cmd"));
+		try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+			container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+		}
+		finally {
+			new DockerApi().image().remove(imageReference, false);
+		}
 	}
 
 	@TestTemplate
@@ -108,13 +124,24 @@ class BootBuildImageIntegrationTests {
 		writeMainClass();
 		writeLongNameResource();
 		String projectName = this.gradleBuild.getProjectDir().getName();
+		ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
+
 		BuildResult result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=ALWAYS");
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		assertThat(result.getOutput()).contains("Pulled builder image").contains("Pulled run image");
+		try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+			container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+		}
+
 		result = this.gradleBuild.build("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		assertThat(result.getOutput()).doesNotContain("Pulled builder image").doesNotContain("Pulled run image");
-		removeImage(projectName);
+		try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+			container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+		}
+		finally {
+			new DockerApi().image().remove(imageReference, false);
+		}
 	}
 
 	@TestTemplate
@@ -132,7 +159,6 @@ class BootBuildImageIntegrationTests {
 		writeLongNameResource();
 		BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage", "--pullPolicy=IF_NOT_PRESENT");
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.FAILED);
-		assertThat(result.getOutput()).contains("Forced builder failure");
 		assertThat(result.getOutput()).containsPattern("Builder lifecycle '.*' failed with status code");
 	}
 
@@ -172,12 +198,16 @@ class BootBuildImageIntegrationTests {
 		String projectName = this.gradleBuild.getProjectDir().getName();
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		assertThat(result.getOutput()).contains("docker.io/library/" + projectName);
-		assertThat(result.getOutput()).contains("---> Test Info buildpack building");
-		assertThat(result.getOutput()).contains("---> Test Info buildpack done");
 		File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs");
 		assertThat(buildLibs.listFiles())
 				.containsExactly(new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".war"));
-		removeImage(projectName);
+		ImageReference imageReference = ImageReference.of(ImageName.of(projectName));
+		try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+			container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+		}
+		finally {
+			new DockerApi().image().remove(imageReference, false);
+		}
 	}
 
 	private void writeMainClass() {
@@ -219,9 +249,4 @@ class BootBuildImageIntegrationTests {
 		}
 	}
 
-	private void removeImage(String name) throws IOException {
-		ImageReference imageReference = ImageReference.of(ImageName.of(name));
-		new DockerApi().image().remove(imageReference, false);
-	}
-
 }

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

-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"
-}
\ No newline at end of file

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.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"
-}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-builder-error/pom.xml

@@ -23,9 +23,8 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
 								<env>
-									<FORCE_FAILURE>true</FORCE_FAILURE>
+									<BP_JVM_VERSION>13.9.9</BP_JVM_VERSION>
 								</env>
 							</image>
 						</configuration>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source-with-repackage/pom.xml

@@ -43,11 +43,6 @@
 						<goals>
 							<goal>build-image</goal>
 						</goals>
-						<configuration>
-							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
-							</image>
-						</configuration>
 					</execution>
 				</executions>
 				<configuration>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-source/pom.xml

@@ -37,11 +37,6 @@
 						<goals>
 							<goal>build-image</goal>
 						</goals>
-						<configuration>
-							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
-							</image>
-						</configuration>
 					</execution>
 				</executions>
 				<configuration>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier-with-repackage/pom.xml

@@ -27,11 +27,6 @@
 						<goals>
 							<goal>build-image</goal>
 						</goals>
-						<configuration>
-							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
-							</image>
-						</configuration>
 					</execution>
 				</executions>
 				<configuration>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-classifier/pom.xml

@@ -21,11 +21,6 @@
 						<goals>
 							<goal>build-image</goal>
 						</goals>
-						<configuration>
-							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
-							</image>
-						</configuration>
 					</execution>
 				</executions>
 				<configuration>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.boot.maven.it</groupId>
-	<artifactId>build-image</artifactId>
-	<version>0.0.1.BUILD-SNAPSHOT</version>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>@java.version@</maven.compiler.source>
-		<maven.compiler.target>@java.version@</maven.compiler.target>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>@project.groupId@</groupId>
-				<artifactId>@project.artifactId@</artifactId>
-				<version>@project.version@</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>build-image</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-cmd-line/src/main/java/org/test/SampleApplication.java

-/*
- * Copyright 2012-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.test;
-
-public class SampleApplication {
-
-	public static void main(String[] args) throws Exception {
-		System.out.println("Launched");
-		synchronized(args) {
-			args.wait(); // Prevent exit"
-		}
-	}
-
-}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-builder/pom.xml

@@ -23,8 +23,8 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
-								<runImage>paketobuildpacks/run:tiny-cnb</runImage>
+								<builder>paketobuildpacks/builder:full</builder>
+								<runImage>paketobuildpacks/run:full-cnb</runImage>
 							</image>
 						</configuration>
 					</execution>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-custom-name/pom.xml

@@ -23,7 +23,6 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
 								<name>example.com/test/build-image:${project.version}</name>
 							</image>
 						</configuration>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-empty-env-entry/pom.xml

@@ -23,7 +23,6 @@
 						</goals>
 						<configuration>
 							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
 								<env>
 									<EMPTY_KEY></EMPTY_KEY>
 								</env>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-final-name/pom.xml

@@ -24,9 +24,6 @@
 						</goals>
 						<configuration>
 							<finalName>final-name</finalName>
-							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
-							</image>
 						</configuration>
 					</execution>
 				</executions>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image-with-repackage/pom.xml

@@ -27,11 +27,6 @@
 						<goals>
 							<goal>build-image</goal>
 						</goals>
-						<configuration>
-							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
-							</image>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/build-image/pom.xml

@@ -21,11 +21,6 @@
 						<goals>
 							<goal>build-image</goal>
 						</goals>
-						<configuration>
-							<image>
-								<builder>springci/spring-boot-cnb-builder:0.0.1</builder>
-							</image>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>

src/spring-boot-builder/README.adoc

-= Spring Boot Test Builder
-
-This directory contains a Cloud Native Buildpacks https://buildpacks.io/docs/concepts/components/builder/[builder] and https://buildpacks.io/docs/concepts/components/buildpack/[buildpack] that is used by integration tests to verify the behavior of the Spring Boot build plugins.
-
-== Creating the builder
-
-* Install the https://buildpacks.io/docs/install-pack/[pack CLI]
-* Authenticate to Docker Hub via `docker login` using the `springci` repository credentials
-* Use `pack` to create the builder image and publish it to Docker Hub:
-
-[source,bash]
-----
-$ cd builder
-$ pack builder create springci/spring-boot-cnb-builder:0.0.1 --config builder.toml --publish
-----

src/spring-boot-builder/builder/builder.toml

-# Buildpacks to include in builder
-[[buildpacks]]
-id = "spring-boot/test-info"
-version = "0.0.1"
-uri = "../buildpacks/test-info"
-
-# Order used for detection
-[[order]]
-[[order.group]]
-id = "spring-boot/test-info"
-version = "0.0.1"
-
-# Stack that will be used by the builder
-[stack]
-id = "io.paketo.stacks.tiny"
-build-image = "index.docker.io/paketobuildpacks/build:1.2.2-tiny-cnb"
-run-image = "index.docker.io/paketobuildpacks/run:tiny-cnb"
-run-image-mirrors = ["gcr.io/paketo-buildpacks/run:tiny-cnb"]

src/spring-boot-builder/buildpacks/test-info/bin/build

-#!/usr/bin/env bash
-set -eo pipefail
-
-echo "---> Test Info buildpack building"
-
-# INPUT ARGUMENTS
-platform_dir=$2
-env_dir=${platform_dir}/env
-bindings_dir=${platform_dir}/bindings
-
-if [[ -f ${env_dir}/FORCE_FAILURE ]]; then
-  echo "Forced builder failure"
-  exit 1
-fi
-
-if compgen -G "${env_dir}/*" > /dev/null; then
-  for var in ${env_dir}/*; do
-    echo "env: $(basename ${var})=$(<${var})"
-  done
-fi
-
-if compgen -G "${bindings_dir}/*" > /dev/null; then
-  for binding in ${bindings_dir}/*; do
-    for f in ${binding}/*; do
-      echo "binding: $(basename ${binding})/$(basename ${f})=$(<${f})"
-    done
-  done
-fi
-
-echo "---> Test Info buildpack done"

src/spring-boot-builder/buildpacks/test-info/bin/detect

-#!/usr/bin/env bash
-set -eo pipefail
-
-# 1. CHECK IF APPLICABLE
-if [[ ! -f META-INF/MANIFEST.MF ]]; then
-    exit 100
-fi
-
-# 2. GET ARGS
-plan_path=$2
-
-# 3. DECLARE DEPENDENCIES (OPTIONAL)
-cat >> "${plan_path}" <<EOL
-# Buildpack provides this dependency
-#
-# NOTE: The dependency is provided during the 'build' process.
-#
-[[provides]]
-name = "test-info"
-
-# Buildpack requires this dependency
-#
-# NOTE: Everything aside from 'name' is simply additional information that the providing buildpack can use to resolve
-#       the dependency.
-#
-[[requires]]
-name = "test-info"
-EOL
\ No newline at end of file

src/spring-boot-builder/buildpacks/test-info/buildpack.toml

-# Buildpack API version
-api = "0.2"
-
-# Buildpack ID and metadata
-[buildpack]
-id = "spring-boot/test-info"
-version = "0.0.1"
-name = "Spring Boot Test Info Buildpack"
-homepage = "https://github.com/spring-projects/spring-boot"
-
-# Stacks that the buildpack will work with
-[[stacks]]
-id = "io.paketo.stacks.tiny"