Update spring-boot-maven-plugin to use docker-test plugin

See gh-41228

Author: wilkinsona

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

@@ -3,6 +3,7 @@ plugins {
 	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.maven-plugin"
 	id "org.springframework.boot.optional-dependencies"
+	id "org.springframework.boot.docker-test"
 }
 
 description = "Spring Boot Maven Plugin"
@@ -25,6 +26,15 @@ dependencies {
 		exclude(group: "javax.enterprise", module: "cdi-api")
 		exclude(group: "javax.inject", module: "javax.inject")
 	}
+	
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	dockerTestImplementation("org.apache.maven.shared:maven-invoker") {
+		exclude(group: "javax.inject", module: "javax.inject")
+	}
+	dockerTestImplementation("org.assertj:assertj-core")
+	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
+	dockerTestImplementation("org.testcontainers:junit-jupiter")
+	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
 	implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
@@ -47,8 +57,6 @@ dependencies {
 	}
 	intTestImplementation("org.assertj:assertj-core")
 	intTestImplementation("org.junit.jupiter:junit-jupiter")
-	intTestImplementation("org.testcontainers:testcontainers")
-	intTestImplementation("org.testcontainers:junit-jupiter")
 
 	mavenOptionalImplementation("org.apache.maven.plugins:maven-shade-plugin") {
 		exclude(group: "javax.annotation", module: "javax.annotation-api")
@@ -97,6 +105,9 @@ sourceSets {
 	intTest {
 		output.dir("${buildDir}/generated-resources", builtBy: "extractVersionProperties")
 	}
+	dockerTest {
+		output.dir("${buildDir}/generated-resources", builtBy: "extractVersionProperties")
+	}
 }
 
 tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
@@ -180,3 +191,7 @@ tasks.named("documentPluginGoals") {
 		"test-run": "run"
 	]
 }
+
+tasks.named("dockerTest").configure {
+	dependsOn tasks.named("prepareMavenBinaries")
+}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java renamed to spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageRegistryIntegrationTests.java

@@ -61,7 +61,7 @@ void setUp() {
 	void whenBuildImageIsInvokedWithPublish(MavenBuild mavenBuild) {
 		String repoName = "test-image";
 		String imageName = this.registryAddress + "/" + repoName;
-		mavenBuild.project("build-image-publish")
+		mavenBuild.project("dockerTest", "build-image-publish")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.imageName", imageName)
 			.execute((project) -> {

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

@@ -57,7 +57,7 @@ class BuildImageTests extends AbstractArchiveIntegrationTests {
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithoutRepackageTheArchiveIsRepackagedOnTheFly(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image")
+		mavenBuild.project("dockerTest", "build-image")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.prepare(this::writeLongNameResource)
@@ -77,7 +77,7 @@ void whenBuildImageIsInvokedWithoutRepackageTheArchiveIsRepackagedOnTheFly(Maven
 
 	@TestTemplate
 	void whenBuildImageIsInvokedOnTheCommandLineWithoutRepackageTheArchiveIsRepackagedOnTheFly(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-cmd-line")
+		mavenBuild.project("dockerTest", "build-image-cmd-line")
 			.goals("spring-boot:build-image")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.prepare(this::writeLongNameResource)
@@ -97,7 +97,7 @@ void whenBuildImageIsInvokedOnTheCommandLineWithoutRepackageTheArchiveIsRepackag
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithClassifierWithoutRepackageTheArchiveIsRepackagedOnTheFly(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-classifier")
+		mavenBuild.project("dockerTest", "build-image-classifier")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.prepare(this::writeLongNameResource)
@@ -118,7 +118,7 @@ void whenBuildImageIsInvokedWithClassifierWithoutRepackageTheArchiveIsRepackaged
 	@TestTemplate
 	void whenBuildImageIsInvokedWithClassifierSourceWithoutRepackageTheArchiveIsRepackagedOnTheFly(
 			MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-classifier-source")
+		mavenBuild.project("dockerTest", "build-image-classifier-source")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.prepare(this::writeLongNameResource)
@@ -139,7 +139,7 @@ void whenBuildImageIsInvokedWithClassifierSourceWithoutRepackageTheArchiveIsRepa
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithRepackageTheExistingArchiveIsUsed(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-with-repackage")
+		mavenBuild.project("dockerTest", "build-image-with-repackage")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.prepare(this::writeLongNameResource)
@@ -160,7 +160,7 @@ void whenBuildImageIsInvokedWithRepackageTheExistingArchiveIsUsed(MavenBuild mav
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithClassifierAndRepackageTheExistingArchiveIsUsed(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-classifier-with-repackage")
+		mavenBuild.project("dockerTest", "build-image-classifier-with-repackage")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.prepare(this::writeLongNameResource)
@@ -181,7 +181,7 @@ void whenBuildImageIsInvokedWithClassifierAndRepackageTheExistingArchiveIsUsed(M
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithClassifierSourceAndRepackageTheExistingArchiveIsUsed(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-classifier-source-with-repackage")
+		mavenBuild.project("dockerTest", "build-image-classifier-source-with-repackage")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.prepare(this::writeLongNameResource)
@@ -203,7 +203,7 @@ void whenBuildImageIsInvokedWithClassifierSourceAndRepackageTheExistingArchiveIs
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithWarPackaging(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-war-packaging")
+		mavenBuild.project("dockerTest", "build-image-war-packaging")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.prepare(this::writeLongNameResource)
@@ -223,7 +223,7 @@ void whenBuildImageIsInvokedWithWarPackaging(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithCustomImageName(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-custom-name")
+		mavenBuild.project("dockerTest", "build-image-custom-name")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.systemProperty("spring-boot.build-image.imageName", "example.com/test/property-ignored:pom-preferred")
@@ -243,7 +243,7 @@ void whenBuildImageIsInvokedWithCustomImageName(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithCommandLineParameters(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image")
+		mavenBuild.project("dockerTest", "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")
@@ -266,7 +266,7 @@ void whenBuildImageIsInvokedWithCommandLineParameters(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithCustomBuilderImageAndRunImage(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-custom-builder")
+		mavenBuild.project("dockerTest", "build-image-custom-builder")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.execute((project) -> {
@@ -281,7 +281,7 @@ void whenBuildImageIsInvokedWithCustomBuilderImageAndRunImage(MavenBuild mavenBu
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithEmptyEnvEntry(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-empty-env-entry")
+		mavenBuild.project("dockerTest", "build-image-empty-env-entry")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.prepare(this::writeLongNameResource)
@@ -297,7 +297,7 @@ void whenBuildImageIsInvokedWithEmptyEnvEntry(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithZipPackaging(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-zip-packaging")
+		mavenBuild.project("dockerTest", "build-image-zip-packaging")
 			.goals("package")
 			.prepare(this::writeLongNameResource)
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
@@ -314,7 +314,7 @@ void whenBuildImageIsInvokedWithZipPackaging(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithBuildpacks(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-custom-buildpacks")
+		mavenBuild.project("dockerTest", "build-image-custom-buildpacks")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.execute((project) -> {
@@ -327,7 +327,7 @@ void whenBuildImageIsInvokedWithBuildpacks(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithBinding(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-bindings")
+		mavenBuild.project("dockerTest", "build-image-bindings")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.execute((project) -> {
@@ -342,7 +342,7 @@ void whenBuildImageIsInvokedWithBinding(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithNetworkModeNone(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-network")
+		mavenBuild.project("dockerTest", "build-image-network")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.execute((project) -> {
@@ -356,7 +356,7 @@ void whenBuildImageIsInvokedWithNetworkModeNone(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void whenBuildImageIsInvokedOnMultiModuleProjectWithPackageGoal(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-multi-module")
+		mavenBuild.project("dockerTest", "build-image-multi-module")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.execute((project) -> {
@@ -369,7 +369,7 @@ void whenBuildImageIsInvokedOnMultiModuleProjectWithPackageGoal(MavenBuild maven
 
 	@TestTemplate
 	void whenBuildImageIsInvokedWithTags(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-tags")
+		mavenBuild.project("dockerTest", "build-image-tags")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.execute((project) -> {
@@ -386,7 +386,7 @@ void whenBuildImageIsInvokedWithTags(MavenBuild mavenBuild) {
 	@TestTemplate
 	void whenBuildImageIsInvokedWithVolumeCaches(MavenBuild mavenBuild) {
 		String testBuildId = randomString();
-		mavenBuild.project("build-image-volume-caches")
+		mavenBuild.project("dockerTest", "build-image-volume-caches")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.systemProperty("test-build-id", testBuildId)
@@ -404,7 +404,7 @@ void whenBuildImageIsInvokedWithVolumeCaches(MavenBuild mavenBuild) {
 			+ "Docker Desktop on other OSs")
 	void whenBuildImageIsInvokedWithBindCaches(MavenBuild mavenBuild) {
 		String testBuildId = randomString();
-		mavenBuild.project("build-image-bind-caches")
+		mavenBuild.project("dockerTest", "build-image-bind-caches")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.systemProperty("test-build-id", testBuildId)
@@ -435,7 +435,7 @@ private static void cleanupCache(Path buildCachePath) {
 	@TestTemplate
 	void whenBuildImageIsInvokedWithCreatedDate(MavenBuild mavenBuild) {
 		String testBuildId = randomString();
-		mavenBuild.project("build-image-created-date")
+		mavenBuild.project("dockerTest", "build-image-created-date")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.systemProperty("test-build-id", testBuildId)
@@ -453,7 +453,7 @@ void whenBuildImageIsInvokedWithCreatedDate(MavenBuild mavenBuild) {
 	@TestTemplate
 	void whenBuildImageIsInvokedWithCurrentCreatedDate(MavenBuild mavenBuild) {
 		String testBuildId = randomString();
-		mavenBuild.project("build-image-current-created-date")
+		mavenBuild.project("dockerTest", "build-image-current-created-date")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.systemProperty("test-build-id", testBuildId)
@@ -476,7 +476,7 @@ void whenBuildImageIsInvokedWithCurrentCreatedDate(MavenBuild mavenBuild) {
 	@TestTemplate
 	void whenBuildImageIsInvokedWithApplicationDirectory(MavenBuild mavenBuild) {
 		String testBuildId = randomString();
-		mavenBuild.project("build-image-app-dir")
+		mavenBuild.project("dockerTest", "build-image-app-dir")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.systemProperty("test-build-id", testBuildId)
@@ -491,7 +491,7 @@ void whenBuildImageIsInvokedWithApplicationDirectory(MavenBuild mavenBuild) {
 	@TestTemplate
 	void whenBuildImageIsInvokedWithEmptySecurityOptions(MavenBuild mavenBuild) {
 		String testBuildId = randomString();
-		mavenBuild.project("build-image-security-opts")
+		mavenBuild.project("dockerTest", "build-image-security-opts")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.systemProperty("test-build-id", testBuildId)
@@ -505,15 +505,15 @@ void whenBuildImageIsInvokedWithEmptySecurityOptions(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void failsWhenBuildImageIsInvokedOnMultiModuleProjectWithBuildImageGoal(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-multi-module")
+		mavenBuild.project("dockerTest", "build-image-multi-module")
 			.goals("spring-boot:build-image")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.executeAndFail((project) -> assertThat(buildLog(project)).contains("Error packaging archive for image"));
 	}
 
 	@TestTemplate
 	void failsWhenBuilderFails(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-builder-error")
+		mavenBuild.project("dockerTest", "build-image-builder-error")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.executeAndFail((project) -> assertThat(buildLog(project)).contains("Building image")
@@ -524,7 +524,7 @@ void failsWhenBuilderFails(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void failsWithBuildpackNotInBuilder(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-bad-buildpack")
+		mavenBuild.project("dockerTest", "build-image-bad-buildpack")
 			.goals("package")
 			.systemProperty("spring-boot.build-image.pullPolicy", "IF_NOT_PRESENT")
 			.executeAndFail((project) -> assertThat(buildLog(project))
@@ -533,15 +533,15 @@ void failsWithBuildpackNotInBuilder(MavenBuild mavenBuild) {
 
 	@TestTemplate
 	void failsWhenFinalNameIsMisconfigured(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-final-name")
+		mavenBuild.project("dockerTest", "build-image-final-name")
 			.goals("package")
 			.executeAndFail((project) -> assertThat(buildLog(project)).contains("final-name.jar.original")
 				.contains("is required for building an image"));
 	}
 
 	@TestTemplate
 	void failsWhenCachesAreConfiguredTwice(MavenBuild mavenBuild) {
-		mavenBuild.project("build-image-caches-multiple")
+		mavenBuild.project("dockerTest", "build-image-caches-multiple")
 			.goals("package")
 			.executeAndFail((project) -> assertThat(buildLog(project))
 				.contains("Each image building cache can be configured only once"));