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

This reverts commit 586ce00e06, reversing
changes made to 563b8a8cec.

See gh-25839

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageTests.java

@@ -25,6 +25,8 @@ import java.util.Random;
 
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
+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;
@@ -54,9 +56,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 					assertThat(original).doesNotExist();
 					assertThat(buildLog(project)).contains("Building image")
 							.contains("docker.io/library/build-image:0.0.1.BUILD-SNAPSHOT")
-							.contains("---> Test Info buildpack building").contains("env: BP_JVM_VERSION=8.*")
-							.contains("---> Test Info buildpack done").contains("Successfully built image");
-					removeImage("build-image", "0.0.1.BUILD-SNAPSHOT");
+							.contains("Successfully built image");
+					ImageReference imageReference = ImageReference.of(ImageName.of("build-image"),
+							"0.0.1.BUILD-SNAPSHOT");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
@@ -71,9 +79,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 					assertThat(classifier).doesNotExist();
 					assertThat(buildLog(project)).contains("Building image")
 							.contains("docker.io/library/build-image-classifier:0.0.1.BUILD-SNAPSHOT")
-							.contains("---> Test Info buildpack building").contains("env: BP_JVM_VERSION=8.*")
-							.contains("---> Test Info buildpack done").contains("Successfully built image");
-					removeImage("build-image-classifier", "0.0.1.BUILD-SNAPSHOT");
+							.contains("Successfully built image");
+					ImageReference imageReference = ImageReference.of(ImageName.of("build-image-classifier"),
+							"0.0.1.BUILD-SNAPSHOT");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
@@ -90,9 +104,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 					assertThat(original).doesNotExist();
 					assertThat(buildLog(project)).contains("Building image")
 							.contains("docker.io/library/build-image-classifier-source:0.0.1.BUILD-SNAPSHOT")
-							.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
 							.contains("Successfully built image");
-					removeImage("build-image-classifier-source", "0.0.1.BUILD-SNAPSHOT");
+					ImageReference imageReference = ImageReference.of(ImageName.of("build-image-classifier-source"),
+							"0.0.1.BUILD-SNAPSHOT");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
@@ -108,9 +128,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 					assertThat(original).isFile();
 					assertThat(buildLog(project)).contains("Building image")
 							.contains("docker.io/library/build-image-with-repackage:0.0.1.BUILD-SNAPSHOT")
-							.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
 							.contains("Successfully built image");
-					removeImage("build-image-with-repackage", "0.0.1.BUILD-SNAPSHOT");
+					ImageReference imageReference = ImageReference.of(ImageName.of("build-image-with-repackage"),
+							"0.0.1.BUILD-SNAPSHOT");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
@@ -127,9 +153,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 					assertThat(original).isFile();
 					assertThat(buildLog(project)).contains("Building image")
 							.contains("docker.io/library/build-image-classifier-with-repackage:0.0.1.BUILD-SNAPSHOT")
-							.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
 							.contains("Successfully built image");
-					removeImage("build-image-classifier-with-repackage", "0.0.1.BUILD-SNAPSHOT");
+					ImageReference imageReference = ImageReference
+							.of(ImageName.of("build-image-classifier-with-repackage"), "0.0.1.BUILD-SNAPSHOT");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
@@ -146,9 +178,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 					assertThat(original).isFile();
 					assertThat(buildLog(project)).contains("Building image").contains(
 							"docker.io/library/build-image-classifier-source-with-repackage:0.0.1.BUILD-SNAPSHOT")
-							.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
 							.contains("Successfully built image");
-					removeImage("build-image-classifier-source-with-repackage", "0.0.1.BUILD-SNAPSHOT");
+					ImageReference imageReference = ImageReference
+							.of(ImageName.of("build-image-classifier-source-with-repackage"), "0.0.1.BUILD-SNAPSHOT");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
@@ -165,9 +203,15 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 					assertThat(original).doesNotExist();
 					assertThat(buildLog(project)).contains("Building image")
 							.contains("example.com/test/build-image:0.0.1.BUILD-SNAPSHOT")
-							.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
 							.contains("Successfully built image");
-					removeImage("example.com/test/build-image", "0.0.1.BUILD-SNAPSHOT");
+					ImageReference imageReference = ImageReference
+							.of("example.com/test/build-image:0.0.1.BUILD-SNAPSHOT");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
@@ -176,14 +220,18 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 		mavenBuild.project("build-image").goals("package")
 				.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 				.systemProperty("spring-boot.build-image.imageName", "example.com/test/cmd-property-name:v1")
-				.systemProperty("spring-boot.build-image.builder", "springci/spring-boot-cnb-builder:0.0.1")
-				.systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run:tiny-cnb")
+				.systemProperty("spring-boot.build-image.builder", "paketobuildpacks/builder:full")
+				.systemProperty("spring-boot.build-image.runImage", "paketobuildpacks/run:full-cnb")
 				.execute((project) -> {
 					assertThat(buildLog(project)).contains("Building image")
-							.contains("example.com/test/cmd-property-name:v1")
-							.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
-							.contains("Successfully built image");
-					removeImage("example.com/test/cmd-property-name", "v1");
+							.contains("example.com/test/cmd-property-name:v1").contains("Successfully built image");
+					ImageReference imageReference = ImageReference.of("example.com/test/cmd-property-name:v1");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
@@ -193,21 +241,34 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 				.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> {
 					assertThat(buildLog(project)).contains("Building image")
 							.contains("docker.io/library/build-image-v2-builder:0.0.1.BUILD-SNAPSHOT")
-							.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
 							.contains("Successfully built image");
-					removeImage("docker.io/library/build-image-v2-builder", "0.0.1.BUILD-SNAPSHOT");
+					ImageReference imageReference = ImageReference
+							.of("docker.io/library/build-image-v2-builder:0.0.1.BUILD-SNAPSHOT");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithEmptyEnvEntry(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-empty-env-entry").goals("package").prepare(this::writeLongNameResource)
-				.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT").execute((project) -> {
+		mavenBuild.project("build-image-empty-env-entry").goals("package")
+				.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
+				.prepare(this::writeLongNameResource).execute((project) -> {
 					assertThat(buildLog(project)).contains("Building image")
 							.contains("docker.io/library/build-image-empty-env-entry:0.0.1.BUILD-SNAPSHOT")
-							.contains("---> Test Info buildpack building").contains("---> Test Info buildpack done")
 							.contains("Successfully built image");
-					removeImage("build-image-empty-env-entry", "0.0.1.BUILD-SNAPSHOT");
+					ImageReference imageReference = ImageReference.of(ImageName.of("build-image-empty-env-entry"),
+							"0.0.1.BUILD-SNAPSHOT");
+					try (GenericContainer<?> container = new GenericContainer<>(imageReference.toString())) {
+						container.waitingFor(Wait.forLogMessage("Launched\\n", 1)).start();
+					}
+					finally {
+						removeImage(imageReference);
+					}
 				});
 	}
 
@@ -222,7 +283,6 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 		mavenBuild.project("build-image-builder-error").goals("package")
 				.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 				.executeAndFail((project) -> assertThat(buildLog(project)).contains("Building image")
-						.contains("---> Test Info buildpack building").contains("Forced builder failure")
 						.containsPattern("Builder lifecycle '.*' failed with status code"));
 	}
 
@@ -252,8 +312,7 @@ public class BuildImageTests extends AbstractArchiveIntegrationTests {
 		}
 	}
 
-	private void removeImage(String name, String version) {
-		ImageReference imageReference = ImageReference.of(ImageName.of(name), version);
+	private void removeImage(ImageReference imageReference) {
 		try {
 			new DockerApi().image().remove(imageReference, false);
 		}

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

@@ -1,29 +0,0 @@
-<?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

@@ -1,28 +0,0 @@
-/*
- * 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>