GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polish "Upgrade to Testcontainers 2.0.1" 

See gh-47664
pull/47694/head
Stéphane Nicoll 2 months ago
parent
7f64615690
commit
adb6481c62
23 changed files with 5 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      build-plugin/spring-boot-gradle-plugin/build.gradle
  2. 1
      build-plugin/spring-boot-maven-plugin/build.gradle
  3. 4
      documentation/spring-boot-docs/build.gradle
  4. 1
      integration-test/spring-boot-loader-integration-tests/build.gradle
  5. 1
      integration-test/spring-boot-sni-integration-tests/build.gradle
  6. 1
      module/spring-boot-cache/build.gradle
  7. 1
      module/spring-boot-data-couchbase-test/build.gradle
  8. 1
      module/spring-boot-data-elasticsearch-test/build.gradle
  9. 1
      module/spring-boot-data-ldap-test/build.gradle
  10. 1
      module/spring-boot-data-mongodb-test/build.gradle
  11. 1
      module/spring-boot-data-neo4j-test/build.gradle
  12. 2
      module/spring-boot-data-neo4j/build.gradle
  13. 1
      module/spring-boot-data-redis-test/build.gradle
  14. 1
      module/spring-boot-mail/build.gradle
  15. 2
      smoke-test/spring-boot-smoke-test-activemq/build.gradle
  16. 2
      smoke-test/spring-boot-smoke-test-artemis/build.gradle
  17. 1
      smoke-test/spring-boot-smoke-test-data-cassandra/build.gradle
  18. 1
      smoke-test/spring-boot-smoke-test-data-couchbase/build.gradle
  19. 1
      smoke-test/spring-boot-smoke-test-data-elasticsearch/build.gradle
  20. 1
      smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle
  21. 1
      smoke-test/spring-boot-smoke-test-data-redis/build.gradle
  22. 1
      system-test/spring-boot-deployment-system-tests/build.gradle
  23. 1
      system-test/spring-boot-image-system-tests/build.gradle

1
build-plugin/spring-boot-gradle-plugin/build.gradle
Unescape View File

@ -42,7 +42,6 @@ dependencies {
dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.assertj:assertj-core")
dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
implementation(project(":buildpack:spring-boot-buildpack-platform")) implementation(project(":buildpack:spring-boot-buildpack-platform"))
implementation(project(":loader:spring-boot-loader-tools")) implementation(project(":loader:spring-boot-loader-tools"))

1
build-plugin/spring-boot-maven-plugin/build.gradle
Unescape View File

@ -44,7 +44,6 @@ dependencies {
dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.assertj:assertj-core")
dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
implementation(project(":buildpack:spring-boot-buildpack-platform")) implementation(project(":buildpack:spring-boot-buildpack-platform"))
implementation(project(":loader:spring-boot-loader-tools")) implementation(project(":loader:spring-boot-loader-tools"))

4
documentation/spring-boot-docs/build.gradle
Unescape View File

@ -212,10 +212,10 @@ dependencies {
implementation("org.springframework.security:spring-security-web") implementation("org.springframework.security:spring-security-web")
implementation("org.springframework.ws:spring-ws-core") implementation("org.springframework.ws:spring-ws-core")
implementation("org.springframework.ws:spring-ws-test") implementation("org.springframework.ws:spring-ws-test")
implementation("org.testcontainers:testcontainers-elasticsearch")
implementation("org.testcontainers:testcontainers-junit-jupiter") implementation("org.testcontainers:testcontainers-junit-jupiter")
implementation("org.testcontainers:testcontainers-neo4j")
implementation("org.testcontainers:testcontainers-mongodb") implementation("org.testcontainers:testcontainers-mongodb")
implementation("org.testcontainers:testcontainers-elasticsearch") implementation("org.testcontainers:testcontainers-neo4j")
implementation("org.junit.jupiter:junit-jupiter") implementation("org.junit.jupiter:junit-jupiter")
implementation("org.yaml:snakeyaml") implementation("org.yaml:snakeyaml")

1
integration-test/spring-boot-loader-integration-tests/build.gradle
Unescape View File

@ -39,7 +39,6 @@ dependencies {
dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
dockerTestImplementation(project(":starter:spring-boot-starter-test")) dockerTestImplementation(project(":starter:spring-boot-starter-test"))
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
} }
tasks.register("syncMavenRepository", Sync) { tasks.register("syncMavenRepository", Sync) {

1
integration-test/spring-boot-sni-integration-tests/build.gradle
Unescape View File

@ -41,7 +41,6 @@ dependencies {
intTestImplementation(project(":test-support:spring-boot-test-support")) intTestImplementation(project(":test-support:spring-boot-test-support"))
intTestImplementation(project(":starter:spring-boot-starter-test")) intTestImplementation(project(":starter:spring-boot-starter-test"))
intTestImplementation("org.testcontainers:testcontainers-junit-jupiter") intTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
intTestImplementation("org.testcontainers:testcontainers")
} }
tasks.register("syncMavenRepository", Sync) { tasks.register("syncMavenRepository", Sync) {

1
module/spring-boot-cache/build.gradle vendored
Unescape View File

@ -58,7 +58,6 @@ dependencies {
dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
dockerTestImplementation("com.redis:testcontainers-redis") dockerTestImplementation("com.redis:testcontainers-redis")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
testImplementation(project(":core:spring-boot-test")) testImplementation(project(":core:spring-boot-test"))
testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(project(":test-support:spring-boot-test-support"))

1
module/spring-boot-data-couchbase-test/build.gradle
Unescape View File

@ -37,7 +37,6 @@ dependencies {
dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-couchbase") dockerTestImplementation("org.testcontainers:testcontainers-couchbase")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
dockerTestCompileOnly("com.google.code.findbugs:jsr305") dockerTestCompileOnly("com.google.code.findbugs:jsr305")

1
module/spring-boot-data-elasticsearch-test/build.gradle
Unescape View File

@ -40,7 +40,6 @@ dependencies {
dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch") dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(project(":test-support:spring-boot-test-support"))

1
module/spring-boot-data-ldap-test/build.gradle
Unescape View File

@ -37,7 +37,6 @@ dependencies {
dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.assertj:assertj-core")
dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(project(":test-support:spring-boot-test-support"))
testImplementation("com.unboundid:unboundid-ldapsdk") testImplementation("com.unboundid:unboundid-ldapsdk")

1
module/spring-boot-data-mongodb-test/build.gradle
Unescape View File

@ -42,7 +42,6 @@ dependencies {
dockerTestImplementation("org.mongodb:mongodb-driver-sync") dockerTestImplementation("org.mongodb:mongodb-driver-sync")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-mongodb") dockerTestImplementation("org.testcontainers:testcontainers-mongodb")
dockerTestImplementation("org.testcontainers:testcontainers")
dockerTestCompileOnly("com.google.code.findbugs:jsr305") dockerTestCompileOnly("com.google.code.findbugs:jsr305")

1
module/spring-boot-data-neo4j-test/build.gradle
Unescape View File

@ -39,7 +39,6 @@ dependencies {
dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-neo4j") dockerTestImplementation("org.testcontainers:testcontainers-neo4j")
dockerTestImplementation("org.testcontainers:testcontainers")
testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(project(":test-support:spring-boot-test-support"))

2
module/spring-boot-data-neo4j/build.gradle
Unescape View File

@ -39,8 +39,8 @@ dependencies {
dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
dockerTestImplementation("ch.qos.logback:logback-classic") dockerTestImplementation("ch.qos.logback:logback-classic")
dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-neo4j")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-neo4j")
testImplementation(project(":core:spring-boot-test")) testImplementation(project(":core:spring-boot-test"))
testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(project(":test-support:spring-boot-test-support"))

1
module/spring-boot-data-redis-test/build.gradle
Unescape View File

@ -39,7 +39,6 @@ dependencies {
dockerTestImplementation("org.assertj:assertj-core") dockerTestImplementation("org.assertj:assertj-core")
dockerTestImplementation("org.junit.jupiter:junit-jupiter") dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
dockerTestRuntimeOnly("io.lettuce:lettuce-core") dockerTestRuntimeOnly("io.lettuce:lettuce-core")
dockerTestRuntimeOnly("org.springframework.data:spring-data-redis") dockerTestRuntimeOnly("org.springframework.data:spring-data-redis")

1
module/spring-boot-mail/build.gradle
Unescape View File

@ -37,7 +37,6 @@ dependencies {
dockerTestImplementation(project(":core:spring-boot-test")) dockerTestImplementation(project(":core:spring-boot-test"))
dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
dockerTestImplementation("org.testcontainers:testcontainers")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")

2
smoke-test/spring-boot-smoke-test-activemq/build.gradle
Unescape View File

@ -28,8 +28,8 @@ dependencies {
dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":core:spring-boot-testcontainers"))
dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
dockerTestImplementation("org.awaitility:awaitility") dockerTestImplementation("org.awaitility:awaitility")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-activemq") dockerTestImplementation("org.testcontainers:testcontainers-activemq")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
} }
tasks.named("compileTestJava") { tasks.named("compileTestJava") {

2
smoke-test/spring-boot-smoke-test-artemis/build.gradle
Unescape View File

@ -28,8 +28,8 @@ dependencies {
dockerTestImplementation(project(":core:spring-boot-testcontainers")) dockerTestImplementation(project(":core:spring-boot-testcontainers"))
dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
dockerTestImplementation("org.awaitility:awaitility") dockerTestImplementation("org.awaitility:awaitility")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-activemq") dockerTestImplementation("org.testcontainers:testcontainers-activemq")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
} }
tasks.named("compileTestJava") { tasks.named("compileTestJava") {

1
smoke-test/spring-boot-smoke-test-data-cassandra/build.gradle
Unescape View File

@ -35,7 +35,6 @@ dependencies {
dockerTestImplementation("org.junit.platform:junit-platform-launcher") dockerTestImplementation("org.junit.platform:junit-platform-launcher")
dockerTestImplementation("org.testcontainers:testcontainers-cassandra") dockerTestImplementation("org.testcontainers:testcontainers-cassandra")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
} }
tasks.named("compileTestJava") { tasks.named("compileTestJava") {

1
smoke-test/spring-boot-smoke-test-data-couchbase/build.gradle
Unescape View File

@ -38,7 +38,6 @@ dependencies {
dockerTestImplementation("org.junit.platform:junit-platform-launcher") dockerTestImplementation("org.junit.platform:junit-platform-launcher")
dockerTestImplementation("org.testcontainers:testcontainers-couchbase") dockerTestImplementation("org.testcontainers:testcontainers-couchbase")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
} }
tasks.named("compileTestJava") { tasks.named("compileTestJava") {

1
smoke-test/spring-boot-smoke-test-data-elasticsearch/build.gradle
Unescape View File

@ -35,7 +35,6 @@ dependencies {
dockerTestImplementation("org.junit.platform:junit-platform-launcher") dockerTestImplementation("org.junit.platform:junit-platform-launcher")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch") dockerTestImplementation("org.testcontainers:testcontainers-elasticsearch")
dockerTestImplementation("org.testcontainers:testcontainers")
} }
tasks.named("compileTestJava") { tasks.named("compileTestJava") {

1
smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle
Unescape View File

@ -36,7 +36,6 @@ dependencies {
dockerTestImplementation("org.junit.platform:junit-platform-launcher") dockerTestImplementation("org.junit.platform:junit-platform-launcher")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers-mongodb") dockerTestImplementation("org.testcontainers:testcontainers-mongodb")
dockerTestImplementation("org.testcontainers:testcontainers")
} }
tasks.named("compileTestJava") { tasks.named("compileTestJava") {

1
smoke-test/spring-boot-smoke-test-data-redis/build.gradle
Unescape View File

@ -36,7 +36,6 @@ dependencies {
dockerTestImplementation("org.junit.platform:junit-platform-engine") dockerTestImplementation("org.junit.platform:junit-platform-engine")
dockerTestImplementation("org.junit.platform:junit-platform-launcher") dockerTestImplementation("org.junit.platform:junit-platform-launcher")
dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
dockerTestImplementation("redis.clients:jedis") dockerTestImplementation("redis.clients:jedis")
} }

1
system-test/spring-boot-deployment-system-tests/build.gradle
Unescape View File

@ -48,7 +48,6 @@ dependencies {
systemTestImplementation("org.slf4j:slf4j-simple") systemTestImplementation("org.slf4j:slf4j-simple")
systemTestImplementation("org.springframework:spring-web") systemTestImplementation("org.springframework:spring-web")
systemTestImplementation("org.testcontainers:testcontainers-junit-jupiter") systemTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
systemTestImplementation("org.testcontainers:testcontainers")
} }
systemTest { systemTest {

1
system-test/spring-boot-image-system-tests/build.gradle
Unescape View File

@ -56,7 +56,6 @@ dependencies {
systemTestImplementation(gradleTestKit()) systemTestImplementation(gradleTestKit())
systemTestImplementation("org.assertj:assertj-core") systemTestImplementation("org.assertj:assertj-core")
systemTestImplementation("org.testcontainers:testcontainers-junit-jupiter") systemTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
systemTestImplementation("org.testcontainers:testcontainers")
} }
toolchain { toolchain {

Write Preview
Loading…
Cancel
Save