Skip to content

Commit 9f166f2

Browse files
wilkinsonawilkinsona
committed
Update spring-boot-autoconfigure to use docker-test plugin
See gh-41228
1 parent 89a0660 commit 9f166f2

18 files changed

+16
-8
lines changed

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

+16-8
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,29 @@ plugins {
55
id "org.springframework.boot.configuration-properties"
66
id "org.springframework.boot.conventions"
77
id "org.springframework.boot.deployed"
8+
id "org.springframework.boot.docker-test"
89
id "org.springframework.boot.optional-dependencies"
910
}
1011

1112
description = "Spring Boot AutoConfigure"
1213

1314
dependencies {
1415
api(project(":spring-boot-project:spring-boot"))
16+
17+
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
18+
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
19+
dockerTestImplementation("org.assertj:assertj-core")
20+
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
21+
dockerTestImplementation("org.mockito:mockito-core")
22+
dockerTestImplementation("org.springframework:spring-test")
23+
dockerTestImplementation("org.testcontainers:cassandra")
24+
dockerTestImplementation("org.testcontainers:couchbase")
25+
dockerTestImplementation("org.testcontainers:elasticsearch")
26+
dockerTestImplementation("org.testcontainers:junit-jupiter")
27+
dockerTestImplementation("org.testcontainers:mongodb")
28+
dockerTestImplementation("org.testcontainers:neo4j")
29+
dockerTestImplementation("org.testcontainers:pulsar")
30+
dockerTestImplementation("org.testcontainers:testcontainers")
1531

1632
optional("co.elastic.clients:elasticsearch-java") {
1733
exclude group: "commons-logging", module: "commons-logging"
@@ -245,14 +261,6 @@ dependencies {
245261
}
246262
testImplementation("org.springframework.pulsar:spring-pulsar-cache-provider-caffeine")
247263
testImplementation("org.springframework.security:spring-security-test")
248-
testImplementation("org.testcontainers:cassandra")
249-
testImplementation("org.testcontainers:couchbase")
250-
testImplementation("org.testcontainers:elasticsearch")
251-
testImplementation("org.testcontainers:junit-jupiter")
252-
testImplementation("org.testcontainers:mongodb")
253-
testImplementation("org.testcontainers:neo4j")
254-
testImplementation("org.testcontainers:pulsar")
255-
testImplementation("org.testcontainers:testcontainers")
256264
testImplementation("org.yaml:snakeyaml")
257265

258266
testRuntimeOnly("jakarta.management.j2ee:jakarta.management.j2ee-api")

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchClientAutoConfigurationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfigurationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfigurationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java

File renamed without changes.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java ‎spring-boot-project/spring-boot-autoconfigure/src/dockerTest/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java

File renamed without changes.

0 commit comments

Comments
 (0)