mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Update spring-boot-docker-compose to use docker-test plugin
See gh-41228
This commit is contained in:
parent
3f1f801461
commit
6fbf08fa9a
@ -3,6 +3,7 @@ plugins {
|
|||||||
id "org.springframework.boot.configuration-properties"
|
id "org.springframework.boot.configuration-properties"
|
||||||
id "org.springframework.boot.conventions"
|
id "org.springframework.boot.conventions"
|
||||||
id "org.springframework.boot.deployed"
|
id "org.springframework.boot.deployed"
|
||||||
|
id "org.springframework.boot.docker-test"
|
||||||
id "org.springframework.boot.optional-dependencies"
|
id "org.springframework.boot.optional-dependencies"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -11,6 +12,16 @@ description = "Spring Boot Docker Compose Support"
|
|||||||
dependencies {
|
dependencies {
|
||||||
api(project(":spring-boot-project:spring-boot"))
|
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.core:jackson-databind")
|
||||||
implementation("com.fasterxml.jackson.module:jackson-module-parameter-names")
|
implementation("com.fasterxml.jackson.module:jackson-module-parameter-names")
|
||||||
|
|
||||||
@ -25,14 +36,8 @@ dependencies {
|
|||||||
testImplementation(project(":spring-boot-project:spring-boot-test"))
|
testImplementation(project(":spring-boot-project:spring-boot-test"))
|
||||||
testImplementation("ch.qos.logback:logback-classic")
|
testImplementation("ch.qos.logback:logback-classic")
|
||||||
testImplementation("org.assertj:assertj-core")
|
testImplementation("org.assertj:assertj-core")
|
||||||
testImplementation("org.awaitility:awaitility")
|
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter")
|
testImplementation("org.junit.jupiter:junit-jupiter")
|
||||||
testImplementation("org.mockito:mockito-core")
|
testImplementation("org.mockito:mockito-core")
|
||||||
testImplementation("org.springframework:spring-core-test")
|
testImplementation("org.springframework:spring-core-test")
|
||||||
testImplementation("org.springframework:spring-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")
|
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@ import org.springframework.boot.testsupport.container.TestImage;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link MariaDbJdbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link MariaDbJdbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Moritz Halbritter
|
* @author Moritz Halbritter
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
@ -25,7 +25,7 @@ import org.springframework.boot.testsupport.container.TestImage;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link MariaDbR2dbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link MariaDbR2dbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Moritz Halbritter
|
* @author Moritz Halbritter
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
@ -23,7 +23,7 @@ import org.springframework.boot.testsupport.container.TestImage;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link MySqlJdbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link MySqlJdbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Moritz Halbritter
|
* @author Moritz Halbritter
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
@ -25,7 +25,7 @@ import org.springframework.boot.testsupport.container.TestImage;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link MySqlR2dbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link MySqlR2dbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Moritz Halbritter
|
* @author Moritz Halbritter
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
@ -34,7 +34,7 @@ import org.springframework.util.ClassUtils;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link OracleFreeJdbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link OracleFreeJdbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
*/
|
*/
|
@ -33,7 +33,7 @@ import org.springframework.r2dbc.core.DatabaseClient;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link OracleFreeR2dbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link OracleFreeR2dbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
*/
|
*/
|
@ -34,7 +34,7 @@ import org.springframework.util.ClassUtils;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link OracleXeJdbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link OracleXeJdbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
*/
|
*/
|
@ -33,7 +33,7 @@ import org.springframework.r2dbc.core.DatabaseClient;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link OracleXeR2dbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link OracleXeR2dbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
*/
|
*/
|
@ -32,7 +32,7 @@ import org.springframework.util.ClassUtils;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link SqlServerJdbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link SqlServerJdbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
*/
|
*/
|
@ -32,7 +32,7 @@ import org.springframework.r2dbc.core.DatabaseClient;
|
|||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Integration tests for {@link SqlServerR2dbcDockerComposeConnectionDetailsFactory}
|
* Integration tests for {@link SqlServerR2dbcDockerComposeConnectionDetailsFactory}.
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
*/
|
*/
|
Loading…
Reference in New Issue
Block a user