Move Docker-related test support into a separate module

See gh-41228

Author: wilkinsona

settings.gradle

@@ -64,6 +64,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-loader-tools"
 include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin"
 include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator"
 include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
+include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
 include "spring-boot-project:spring-boot"
 include "spring-boot-project:spring-boot-autoconfigure"
 include "spring-boot-project:spring-boot-actuator"

spring-boot-project/spring-boot-actuator/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.springframework:spring-test")

spring-boot-project/spring-boot-autoconfigure/build.gradle

@@ -13,9 +13,9 @@ description = "Spring Boot AutoConfigure"
 
 dependencies {
 	api(project(":spring-boot-project:spring-boot"))
-	
+
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.mockito:mockito-core")

spring-boot-project/spring-boot-docker-compose/build.gradle

@@ -1,18 +1,18 @@
 plugins {
-    id "java-library"
+	id "java-library"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.docker-test"
-    id "org.springframework.boot.optional-dependencies"
+	id "org.springframework.boot.optional-dependencies"
 }
 
 description = "Spring Boot Docker Compose Support"
 
 dependencies {
 	api(project(":spring-boot-project:spring-boot"))
 
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
@@ -21,7 +21,7 @@ dependencies {
 	dockerTestRuntimeOnly("com.microsoft.sqlserver:mssql-jdbc")
 	dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc")
 	dockerTestRuntimeOnly("io.r2dbc:r2dbc-mssql")
-	
+
 	implementation("com.fasterxml.jackson.core:jackson-databind")
 	implementation("com.fasterxml.jackson.module:jackson-module-parameter-names")
 

spring-boot-project/spring-boot-test-autoconfigure/build.gradle

@@ -12,9 +12,9 @@ dependencies {
 	api(project(":spring-boot-project:spring-boot"))
 	api(project(":spring-boot-project:spring-boot-test"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure"))
-	
+
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("io.projectreactor:reactor-test")
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
@@ -25,7 +25,7 @@ dependencies {
 	dockerTestImplementation("org.testcontainers:mongodb")
 	dockerTestImplementation("org.testcontainers:neo4j")
 	dockerTestImplementation("org.testcontainers:testcontainers")
-	
+
 	dockerTestRuntimeOnly("io.lettuce:lettuce-core")
 	dockerTestRuntimeOnly("org.springframework.data:spring-data-redis")
 

spring-boot-project/spring-boot-testcontainers/build.gradle

@@ -15,7 +15,7 @@ dependencies {
 	api("org.testcontainers:testcontainers")
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("ch.qos.logback:logback-classic")
 	dockerTestImplementation("co.elastic.clients:elasticsearch-java") {
 		exclude group: "commons-logging", module: "commons-logging"

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle

@@ -44,7 +44,7 @@ dependencies {
 	api("org.springframework:spring-core")
 	api("org.tomlj:tomlj:1.0.0")
 
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 
 	dockerTestRuntimeOnly("org.testcontainers:testcontainers")

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

@@ -80,13 +80,13 @@ dependencies {
 	asciidoctorExtensions("io.spring.asciidoctor:spring-asciidoctor-extensions-section-ids")
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-gradle-test-support"))
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation(gradleTestKit())
 	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"))
 	implementation("io.spring.gradle:dependency-management-plugin")

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

@@ -27,7 +27,7 @@ dependencies {
 		exclude(group: "javax.inject", module: "javax.inject")
 	}
 
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("org.apache.maven.shared:maven-invoker") {
 		exclude(group: "javax.inject", module: "javax.inject")
 	}

spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/build.gradle

@@ -0,0 +1,32 @@
+plugins {
+	id "java-library"
+	id "org.springframework.boot.conventions"
+	id "org.springframework.boot.optional-dependencies"
+}
+
+description = "Spring Boot Docker Testing Support"
+
+dependencies {
+	api(platform(project(path: ":spring-boot-project:spring-boot-parent")))
+	api(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+
+	compileOnly("org.testcontainers:testcontainers")
+
+	compileOnly("org.junit.jupiter:junit-jupiter")
+	compileOnly("org.springframework:spring-core")
+
+	optional("org.testcontainers:cassandra")
+	optional("org.testcontainers:cassandra")
+	optional("org.testcontainers:couchbase")
+	optional("org.testcontainers:elasticsearch")
+	optional("org.testcontainers:junit-jupiter")
+	optional("org.testcontainers:kafka")
+	optional("org.testcontainers:mongodb")
+	optional("org.testcontainers:neo4j")
+	optional("org.testcontainers:oracle-xe")
+	optional("org.testcontainers:oracle-free")
+	optional("org.testcontainers:postgresql")
+	optional("org.testcontainers:pulsar")
+	optional("org.testcontainers:rabbitmq")
+	optional("org.testcontainers:redpanda")
+}