diff --git a/build-plugin/spring-boot-gradle-plugin/build.gradle b/build-plugin/spring-boot-gradle-plugin/build.gradle index 7b4ad618787..43477d97dfd 100644 --- 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 index adb1ff62671..79e6d7c1ba3 100644 --- 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 index ed1c0c7e492..bf5bf6027ce 100644 --- 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 index a1910a709bd..852705daad2 100644 --- 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 index 82d4ed57e2a..444ab7cf51c 100644 --- 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 index 2e170c0dacd..efe08e2c48d 100644 --- 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 index c9b1843793e..c43f4249763 100644 --- 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 index 613d996d825..e481c20dba2 100644 --- 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 index 663edca291e..acb4c24ae26 100644 --- 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 index 0749d2145c9..fada21a51a3 100644 --- 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 index 73b336d2c36..ca20c862342 100644 --- 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 index 73f38b28872..133b9b8e5d9 100644 --- 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 index b33e4b3da6a..6a29fa19911 100644 --- 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 index 4ae3da2fdab..7dee700f163 100644 --- 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 index 05c87033976..8cc7dcafdca 100644 --- 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 index 23d66cefc53..0c3f059763f 100644 --- 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 index 771d935ce2c..a814d1a9921 100644 --- 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 index 38ee664b691..0b2491b064a 100644 --- 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 index ff66ce4f9be..77e7228873f 100644 --- 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 index b269a55fe9e..3fc81924c37 100644 --- 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 index 5e4b5e7a9e9..4edc63c6384 100644 --- 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 index e9e8f4078dc..e496af13dcc 100644 --- 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 index bdde09fb5c1..aff453e139c 100644 --- 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 {