Skip to content

Commit 843de3a

Browse files
committed
Update spring-boot-test-autoconfigure to use docker-test plugin
See gh-41228
1 parent ba053db commit 843de3a

File tree

50 files changed

+20
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+20
-11
lines changed

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

+18-9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
id "java-library"
33
id "org.springframework.boot.conventions"
44
id "org.springframework.boot.deployed"
5+
id "org.springframework.boot.docker-test"
56
id "org.springframework.boot.optional-dependencies"
67
}
78

@@ -11,6 +12,22 @@ dependencies {
1112
api(project(":spring-boot-project:spring-boot"))
1213
api(project(":spring-boot-project:spring-boot-test"))
1314
api(project(":spring-boot-project:spring-boot-autoconfigure"))
15+
16+
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
17+
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
18+
dockerTestImplementation("io.projectreactor:reactor-test")
19+
dockerTestImplementation("org.assertj:assertj-core")
20+
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
21+
dockerTestImplementation("org.testcontainers:cassandra")
22+
dockerTestImplementation("org.testcontainers:couchbase")
23+
dockerTestImplementation("org.testcontainers:elasticsearch")
24+
dockerTestImplementation("org.testcontainers:junit-jupiter")
25+
dockerTestImplementation("org.testcontainers:mongodb")
26+
dockerTestImplementation("org.testcontainers:neo4j")
27+
dockerTestImplementation("org.testcontainers:testcontainers")
28+
29+
dockerTestRuntimeOnly("io.lettuce:lettuce-core")
30+
dockerTestRuntimeOnly("org.springframework.data:spring-data-redis")
1431

1532
optional("jakarta.json.bind:jakarta.json.bind-api")
1633
optional("jakarta.persistence:jakarta.persistence-api")
@@ -62,13 +79,12 @@ dependencies {
6279

6380
testImplementation(project(":spring-boot-project:spring-boot-actuator"))
6481
testImplementation(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
65-
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
6682
testImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
83+
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
6784
testImplementation("ch.qos.logback:logback-classic")
6885
testImplementation("com.fasterxml.jackson.module:jackson-module-parameter-names")
6986
testImplementation("com.h2database:h2")
7087
testImplementation("com.unboundid:unboundid-ldapsdk")
71-
testImplementation("io.lettuce:lettuce-core")
7288
testImplementation("io.micrometer:micrometer-registry-prometheus")
7389
testImplementation("io.projectreactor.netty:reactor-netty-http")
7490
testImplementation("io.projectreactor:reactor-core")
@@ -96,13 +112,6 @@ dependencies {
96112
testImplementation("org.springframework:spring-core-test")
97113
testImplementation("org.springframework.hateoas:spring-hateoas")
98114
testImplementation("org.springframework.plugin:spring-plugin-core")
99-
testImplementation("org.testcontainers:cassandra")
100-
testImplementation("org.testcontainers:couchbase")
101-
testImplementation("org.testcontainers:elasticsearch")
102-
testImplementation("org.testcontainers:junit-jupiter")
103-
testImplementation("org.testcontainers:mongodb")
104-
testImplementation("org.testcontainers:neo4j")
105-
testImplementation("org.testcontainers:testcontainers")
106115
testImplementation("org.thymeleaf:thymeleaf")
107116
}
108117

Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import static org.springframework.boot.test.autoconfigure.AutoConfigurationImportedCondition.importedAutoConfiguration;
3737

3838
/**
39-
* Sample test for {@link DataElasticsearchTest @DataElasticsearchTest}
39+
* Sample test for {@link DataElasticsearchTest @DataElasticsearchTest}.
4040
*
4141
* @author Eddú Meléndez
4242
* @author Moritz Halbritter
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import static org.springframework.boot.test.autoconfigure.AutoConfigurationImportedCondition.importedAutoConfiguration;
3535

3636
/**
37-
* Sample test for {@link DataMongoTest @DataMongoTest}
37+
* Sample test for {@link DataMongoTest @DataMongoTest}.
3838
*
3939
* @author Michael Simons
4040
* @author Moritz Halbritter

0 commit comments

Comments
 (0)