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

See gh-41228

Author: wilkinsona

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

@@ -3,6 +3,7 @@ plugins {
 	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"
 }
 
@@ -11,6 +12,16 @@ 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("org.assertj:assertj-core")
+	dockerTestImplementation("org.awaitility:awaitility")
+	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
+	dockerTestImplementation("org.testcontainers:testcontainers")
+	
+	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")
 
@@ -25,14 +36,8 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation("ch.qos.logback:logback-classic")
 	testImplementation("org.assertj:assertj-core")
-	testImplementation("org.awaitility:awaitility")
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.springframework:spring-core-test")
 	testImplementation("org.springframework:spring-test")
-	testImplementation("org.testcontainers:testcontainers")
-
-	testRuntimeOnly("com.microsoft.sqlserver:mssql-jdbc")
-	testRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc")
-	testRuntimeOnly("io.r2dbc:r2dbc-mssql")
 }

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/core/DockerCliIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/core/DockerCliIntegrationTests.java

@@ -23,7 +23,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link MariaDbJdbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link MariaDbJdbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/activemq/ActiveMQDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -25,7 +25,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link MariaDbR2dbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link MariaDbR2dbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/cassandra/CassandraDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -23,7 +23,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link MySqlJdbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link MySqlJdbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/elasticsearch/ElasticsearchDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -25,7 +25,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link MySqlR2dbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link MySqlR2dbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java

@@ -34,7 +34,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link OracleFreeJdbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link OracleFreeJdbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Andy Wilkinson
  */

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/liquibase/JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/liquibase/JdbcAdaptingLiquibaseConnectionDetailsFactoryIntegrationTests.java

@@ -33,7 +33,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link OracleFreeR2dbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link OracleFreeR2dbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Andy Wilkinson
  */

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -34,7 +34,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link OracleXeJdbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link OracleXeJdbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Andy Wilkinson
  */

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mariadb/MariaDbR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -33,7 +33,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link OracleXeR2dbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link OracleXeR2dbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Andy Wilkinson
  */

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mongo/MongoDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -32,7 +32,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link SqlServerJdbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link SqlServerJdbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Andy Wilkinson
  */

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/mysql/MySqlJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -32,7 +32,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link SqlServerR2dbcDockerComposeConnectionDetailsFactory}
+ * Integration tests for {@link SqlServerR2dbcDockerComposeConnectionDetailsFactory}.
  *
  * @author Andy Wilkinson
  */