Polish "Upgrade to Testcontainers 2.0.1"

snicoll · snicoll · commit adb6481c62d9 · 2025-10-17T17:23:35.000+02:00
See gh-47664
diff --git a/build-plugin/spring-boot-gradle-plugin/build.gradle b/build-plugin/spring-boot-gradle-plugin/build.gradle
@@ -42,7 +42,6 @@ dependencies {
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	implementation(project(":buildpack:spring-boot-buildpack-platform"))
 	implementation(project(":loader:spring-boot-loader-tools"))
diff --git a/build-plugin/spring-boot-maven-plugin/build.gradle b/build-plugin/spring-boot-maven-plugin/build.gradle
@@ -44,7 +44,6 @@ dependencies {
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	implementation(project(":buildpack:spring-boot-buildpack-platform"))
 	implementation(project(":loader:spring-boot-loader-tools"))
diff --git a/documentation/spring-boot-docs/build.gradle b/documentation/spring-boot-docs/build.gradle
@@ -212,10 +212,10 @@ dependencies {
 	implementation("org.springframework.security:spring-security-web")
 	implementation("org.springframework.ws:spring-ws-core")
 	implementation("org.springframework.ws:spring-ws-test")
+	implementation("org.testcontainers:testcontainers-elasticsearch")
 	implementation("org.testcontainers:testcontainers-junit-jupiter")
-	implementation("org.testcontainers:testcontainers-neo4j")
 	implementation("org.testcontainers:testcontainers-mongodb")
-	implementation("org.testcontainers:testcontainers-elasticsearch")
+	implementation("org.testcontainers:testcontainers-neo4j")
 	implementation("org.junit.jupiter:junit-jupiter")
 	implementation("org.yaml:snakeyaml")
 
diff --git a/integration-test/spring-boot-loader-integration-tests/build.gradle b/integration-test/spring-boot-loader-integration-tests/build.gradle
@@ -39,7 +39,6 @@ dependencies {
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation(project(":starter:spring-boot-starter-test"))
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 }
 
 tasks.register("syncMavenRepository", Sync) {
diff --git a/integration-test/spring-boot-sni-integration-tests/build.gradle b/integration-test/spring-boot-sni-integration-tests/build.gradle
@@ -41,7 +41,6 @@ dependencies {
 	intTestImplementation(project(":test-support:spring-boot-test-support"))
 	intTestImplementation(project(":starter:spring-boot-starter-test"))
 	intTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	intTestImplementation("org.testcontainers:testcontainers")
 }
 
 tasks.register("syncMavenRepository", Sync) {
diff --git a/module/spring-boot-cache/build.gradle b/module/spring-boot-cache/build.gradle
@@ -58,7 +58,6 @@ dependencies {
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("com.redis:testcontainers-redis")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	testImplementation(project(":core:spring-boot-test"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
diff --git a/module/spring-boot-data-couchbase-test/build.gradle b/module/spring-boot-data-couchbase-test/build.gradle
@@ -37,7 +37,6 @@ dependencies {
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-couchbase")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	dockerTestCompileOnly("com.google.code.findbugs:jsr305")
 
diff --git a/module/spring-boot-data-elasticsearch-test/build.gradle b/module/spring-boot-data-elasticsearch-test/build.gradle
@@ -40,7 +40,6 @@ dependencies {
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))
 
diff --git a/module/spring-boot-data-ldap-test/build.gradle b/module/spring-boot-data-ldap-test/build.gradle
@@ -37,7 +37,6 @@ dependencies {
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))
 	testImplementation("com.unboundid:unboundid-ldapsdk")
diff --git a/module/spring-boot-data-mongodb-test/build.gradle b/module/spring-boot-data-mongodb-test/build.gradle
@@ -42,7 +42,6 @@ dependencies {
 	dockerTestImplementation("org.mongodb:mongodb-driver-sync")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-mongodb")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	dockerTestCompileOnly("com.google.code.findbugs:jsr305")
 
diff --git a/module/spring-boot-data-neo4j-test/build.gradle b/module/spring-boot-data-neo4j-test/build.gradle
@@ -39,7 +39,6 @@ dependencies {
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-neo4j")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	testImplementation(project(":test-support:spring-boot-test-support"))
 
diff --git a/module/spring-boot-data-neo4j/build.gradle b/module/spring-boot-data-neo4j/build.gradle
@@ -39,8 +39,8 @@ dependencies {
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("ch.qos.logback:logback-classic")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers-neo4j")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
+	dockerTestImplementation("org.testcontainers:testcontainers-neo4j")
 
 	testImplementation(project(":core:spring-boot-test"))
 	testImplementation(project(":test-support:spring-boot-test-support"))
diff --git a/module/spring-boot-data-redis-test/build.gradle b/module/spring-boot-data-redis-test/build.gradle
@@ -39,7 +39,6 @@ dependencies {
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	dockerTestRuntimeOnly("io.lettuce:lettuce-core")
 	dockerTestRuntimeOnly("org.springframework.data:spring-data-redis")
diff --git a/module/spring-boot-mail/build.gradle b/module/spring-boot-mail/build.gradle
@@ -37,7 +37,6 @@ dependencies {
 
 	dockerTestImplementation(project(":core:spring-boot-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
-	dockerTestImplementation("org.testcontainers:testcontainers")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 
 	testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")
diff --git a/smoke-test/spring-boot-smoke-test-activemq/build.gradle b/smoke-test/spring-boot-smoke-test-activemq/build.gradle
@@ -28,8 +28,8 @@ dependencies {
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("org.awaitility:awaitility")
-	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-activemq")
+	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 }
 
 tasks.named("compileTestJava") {
diff --git a/smoke-test/spring-boot-smoke-test-artemis/build.gradle b/smoke-test/spring-boot-smoke-test-artemis/build.gradle
@@ -28,8 +28,8 @@ dependencies {
 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("org.awaitility:awaitility")
-	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-activemq")
+	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 }
 
 tasks.named("compileTestJava") {
diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/build.gradle b/smoke-test/spring-boot-smoke-test-data-cassandra/build.gradle
@@ -35,7 +35,6 @@ dependencies {
 	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
 	dockerTestImplementation("org.testcontainers:testcontainers-cassandra")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 }
 
 tasks.named("compileTestJava") {
diff --git a/smoke-test/spring-boot-smoke-test-data-couchbase/build.gradle b/smoke-test/spring-boot-smoke-test-data-couchbase/build.gradle
@@ -38,7 +38,6 @@ dependencies {
 	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
 	dockerTestImplementation("org.testcontainers:testcontainers-couchbase")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 }
 
 tasks.named("compileTestJava") {
diff --git a/smoke-test/spring-boot-smoke-test-data-elasticsearch/build.gradle b/smoke-test/spring-boot-smoke-test-data-elasticsearch/build.gradle
@@ -35,7 +35,6 @@ dependencies {
 	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 }
 
 tasks.named("compileTestJava") {
diff --git a/smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle b/smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle
@@ -36,7 +36,6 @@ dependencies {
 	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers-mongodb")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 }
 
 tasks.named("compileTestJava") {
diff --git a/smoke-test/spring-boot-smoke-test-data-redis/build.gradle b/smoke-test/spring-boot-smoke-test-data-redis/build.gradle
@@ -36,7 +36,6 @@ dependencies {
 	dockerTestImplementation("org.junit.platform:junit-platform-engine")
 	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	dockerTestImplementation("org.testcontainers:testcontainers")
 	dockerTestImplementation("redis.clients:jedis")
 }
 
diff --git a/system-test/spring-boot-deployment-system-tests/build.gradle b/system-test/spring-boot-deployment-system-tests/build.gradle
@@ -48,7 +48,6 @@ dependencies {
 	systemTestImplementation("org.slf4j:slf4j-simple")
 	systemTestImplementation("org.springframework:spring-web")
 	systemTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	systemTestImplementation("org.testcontainers:testcontainers")
 }
 
 systemTest {
diff --git a/system-test/spring-boot-image-system-tests/build.gradle b/system-test/spring-boot-image-system-tests/build.gradle
@@ -56,7 +56,6 @@ dependencies {
 	systemTestImplementation(gradleTestKit())
 	systemTestImplementation("org.assertj:assertj-core")
 	systemTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
-	systemTestImplementation("org.testcontainers:testcontainers")
 }
 
 toolchain {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ dependencies {`
`39`	`39`	`dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))`
`40`	`40`	`dockerTestImplementation(project(":starter:spring-boot-starter-test"))`
`41`	`41`	`dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")`
`42`		`- dockerTestImplementation("org.testcontainers:testcontainers")`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`tasks.register("syncMavenRepository", Sync) {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ dependencies {`
`41`	`41`	`intTestImplementation(project(":test-support:spring-boot-test-support"))`
`42`	`42`	`intTestImplementation(project(":starter:spring-boot-starter-test"))`
`43`	`43`	`intTestImplementation("org.testcontainers:testcontainers-junit-jupiter")`
`44`		`- intTestImplementation("org.testcontainers:testcontainers")`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`tasks.register("syncMavenRepository", Sync) {`