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

Move Docker-related test support into a separate module 

See gh-41228
pull/42868/head
Andy Wilkinson 2 years ago
parent
fda6f19c5b
commit
654016af7f
38 changed files with 86 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      settings.gradle
  2. 2
      spring-boot-project/spring-boot-actuator/build.gradle
  3. 4
      spring-boot-project/spring-boot-autoconfigure/build.gradle
  4. 8
      spring-boot-project/spring-boot-docker-compose/build.gradle
  5. 6
      spring-boot-project/spring-boot-test-autoconfigure/build.gradle
  6. 2
      spring-boot-project/spring-boot-testcontainers/build.gradle
  7. 2
      spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle
  8. 4
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
  9. 2
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
  10. 32
      spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/build.gradle
  11. 0
      spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java
  12. 0
      spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailable.java
  13. 0
      spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailableCondition.java
  14. 0
      spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RedisContainer.java
  15. 0
      spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RegistryContainer.java
  16. 0
      spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java
  17. 0
      spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/ZipkinContainer.java
  18. 0
      spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/package-info.java
  19. 16
      spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle
  20. 3
      spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
  21. 3
      spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle
  22. 2
      spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
  23. 8
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle
  24. 2
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle
  25. 6
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle
  26. 6
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle
  27. 6
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle
  28. 8
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle
  29. 2
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle
  30. 2
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle
  31. 2
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle
  32. 6
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle
  33. 2
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/build.gradle
  34. 10
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle
  35. 4
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle
  36. 2
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle
  37. 2
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle
  38. 1
      src/checkstyle/checkstyle-suppressions.xml

1
settings.gradle
Unescape View File

@ -64,6 +64,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-loader-tools" @@ -64,6 +64,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-loader-tools"
include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin"
include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator"
include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
include "spring-boot-project:spring-boot"
include "spring-boot-project:spring-boot-autoconfigure"
include "spring-boot-project:spring-boot-actuator"

2
spring-boot-project/spring-boot-actuator/build.gradle
Unescape View File

@ -14,7 +14,7 @@ dependencies { @@ -14,7 +14,7 @@ dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.assertj:assertj-core")
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.springframework:spring-test")

4
spring-boot-project/spring-boot-autoconfigure/build.gradle
Unescape View File

@ -13,9 +13,9 @@ description = "Spring Boot AutoConfigure" @@ -13,9 +13,9 @@ description = "Spring Boot AutoConfigure"
dependencies {
api(project(":spring-boot-project:spring-boot"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.assertj:assertj-core")
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.mockito:mockito-core")

8
spring-boot-project/spring-boot-docker-compose/build.gradle
Unescape View File

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
plugins {
id "java-library"
id "java-library"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.docker-test"
id "org.springframework.boot.optional-dependencies"
id "org.springframework.boot.optional-dependencies"
}
description = "Spring Boot Docker Compose Support"
@ -12,7 +12,7 @@ description = "Spring Boot Docker Compose Support" @@ -12,7 +12,7 @@ description = "Spring Boot Docker Compose Support"
dependencies {
api(project(":spring-boot-project:spring-boot"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.assertj:assertj-core")
dockerTestImplementation("org.awaitility:awaitility")
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
@ -21,7 +21,7 @@ dependencies { @@ -21,7 +21,7 @@ dependencies {
dockerTestRuntimeOnly("com.microsoft.sqlserver:mssql-jdbc")
dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc")
dockerTestRuntimeOnly("io.r2dbc:r2dbc-mssql")
implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.fasterxml.jackson.module:jackson-module-parameter-names")

6
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
Unescape View File

@ -12,9 +12,9 @@ dependencies { @@ -12,9 +12,9 @@ dependencies {
api(project(":spring-boot-project:spring-boot"))
api(project(":spring-boot-project:spring-boot-test"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("io.projectreactor:reactor-test")
dockerTestImplementation("org.assertj:assertj-core")
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
@ -25,7 +25,7 @@ dependencies { @@ -25,7 +25,7 @@ dependencies {
dockerTestImplementation("org.testcontainers:mongodb")
dockerTestImplementation("org.testcontainers:neo4j")
dockerTestImplementation("org.testcontainers:testcontainers")
dockerTestRuntimeOnly("io.lettuce:lettuce-core")
dockerTestRuntimeOnly("org.springframework.data:spring-data-redis")

2
spring-boot-project/spring-boot-testcontainers/build.gradle
Unescape View File

@ -15,7 +15,7 @@ dependencies { @@ -15,7 +15,7 @@ dependencies {
api("org.testcontainers:testcontainers")
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("ch.qos.logback:logback-classic")
dockerTestImplementation("co.elastic.clients:elasticsearch-java") {
exclude group: "commons-logging", module: "commons-logging"

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle
Unescape View File

@ -44,7 +44,7 @@ dependencies { @@ -44,7 +44,7 @@ dependencies {
api("org.springframework:spring-core")
api("org.tomlj:tomlj:1.0.0")
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestRuntimeOnly("org.testcontainers:testcontainers")

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
Unescape View File

@ -80,13 +80,13 @@ dependencies { @@ -80,13 +80,13 @@ dependencies {
asciidoctorExtensions("io.spring.asciidoctor:spring-asciidoctor-extensions-section-ids")
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-gradle-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(gradleTestKit())
dockerTestImplementation("org.assertj:assertj-core")
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
implementation("io.spring.gradle:dependency-management-plugin")

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
Unescape View File

@ -27,7 +27,7 @@ dependencies { @@ -27,7 +27,7 @@ dependencies {
exclude(group: "javax.inject", module: "javax.inject")
}
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.apache.maven.shared:maven-invoker") {
exclude(group: "javax.inject", module: "javax.inject")
}

32
spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/build.gradle
Unescape View File

@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.optional-dependencies"
}
description = "Spring Boot Docker Testing Support"
dependencies {
api(platform(project(path: ":spring-boot-project:spring-boot-parent")))
api(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
compileOnly("org.testcontainers:testcontainers")
compileOnly("org.junit.jupiter:junit-jupiter")
compileOnly("org.springframework:spring-core")
optional("org.testcontainers:cassandra")
optional("org.testcontainers:cassandra")
optional("org.testcontainers:couchbase")
optional("org.testcontainers:elasticsearch")
optional("org.testcontainers:junit-jupiter")
optional("org.testcontainers:kafka")
optional("org.testcontainers:mongodb")
optional("org.testcontainers:neo4j")
optional("org.testcontainers:oracle-xe")
optional("org.testcontainers:oracle-free")
optional("org.testcontainers:postgresql")
optional("org.testcontainers:pulsar")
optional("org.testcontainers:rabbitmq")
optional("org.testcontainers:redpanda")
}

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java → spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/ActiveMQContainer.java
Unescape View File

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailable.java → spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailable.java
Unescape View File

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailableCondition.java → spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailableCondition.java
Unescape View File

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/RedisContainer.java → spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RedisContainer.java
Unescape View File

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/RegistryContainer.java → spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/RegistryContainer.java
Unescape View File

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java → spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java
Unescape View File

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/ZipkinContainer.java → spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/ZipkinContainer.java
Unescape View File

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/container/package-info.java → spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/package-info.java
Unescape View File

16
spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle
Unescape View File

@ -20,22 +20,6 @@ dependencies { @@ -20,22 +20,6 @@ dependencies {
compileOnly("org.mockito:mockito-core")
compileOnly("org.springframework:spring-context")
compileOnly("org.springframework.data:spring-data-redis")
compileOnly("org.testcontainers:testcontainers")
optional("org.testcontainers:cassandra")
optional("org.testcontainers:cassandra")
optional("org.testcontainers:couchbase")
optional("org.testcontainers:elasticsearch")
optional("org.testcontainers:junit-jupiter")
optional("org.testcontainers:kafka")
optional("org.testcontainers:mongodb")
optional("org.testcontainers:neo4j")
optional("org.testcontainers:oracle-xe")
optional("org.testcontainers:oracle-free")
optional("org.testcontainers:postgresql")
optional("org.testcontainers:pulsar")
optional("org.testcontainers:rabbitmq")
optional("org.testcontainers:redpanda")
implementation("jakarta.inject:jakarta.inject-api")
implementation("org.apache.maven.resolver:maven-resolver-connector-basic")

3
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
Unescape View File

@ -19,8 +19,7 @@ dependencies { @@ -19,8 +19,7 @@ dependencies {
app project(path: ":spring-boot-project:spring-boot-parent", configuration: "mavenRepository")
app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
dockerTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation("org.testcontainers:testcontainers")
}

3
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle
Unescape View File

@ -15,8 +15,7 @@ dependencies { @@ -15,8 +15,7 @@ dependencies {
app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository")
dockerTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")

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

@ -21,7 +21,7 @@ dependencies { @@ -21,7 +21,7 @@ dependencies {
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository")
app("org.bouncycastle:bcprov-jdk18on:1.78.1")
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")

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

@ -7,11 +7,11 @@ plugins { @@ -7,11 +7,11 @@ plugins {
description = "Spring Boot Actuator ActiveMQ smoke test"
dependencies {
dockerTestImplementation("org.awaitility:awaitility")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.awaitility:awaitility")
dockerTestImplementation("org.testcontainers:junit-jupiter")
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-activemq"))
}

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

@ -9,7 +9,7 @@ description = "Spring Boot AMQP smoke test" @@ -9,7 +9,7 @@ description = "Spring Boot AMQP smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.awaitility:awaitility")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:rabbitmq")

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle vendored
Unescape View File

@ -27,13 +27,13 @@ dependencies { @@ -27,13 +27,13 @@ dependencies {
couchbase(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
couchbase(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.testcontainers:junit-jupiter")
ehcache(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
ehcache("javax.cache:cache-api")
ehcache("org.ehcache:ehcache::jakarta")

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

@ -9,15 +9,15 @@ description = "Spring Boot Data Cassandra smoke test" @@ -9,15 +9,15 @@ description = "Spring Boot Data Cassandra smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.junit.platform:junit-platform-engine")
dockerTestImplementation("org.junit.platform:junit-platform-launcher")
dockerTestImplementation("org.testcontainers:cassandra")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
dockerTestImplementation("org.testcontainers:cassandra")
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-cassandra"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-cassandra-reactive"))
}

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

@ -9,7 +9,7 @@ description = "Spring Boot Data Couchbase smoke test" @@ -9,7 +9,7 @@ description = "Spring Boot Data Couchbase smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation("io.projectreactor:reactor-core")
dockerTestImplementation("io.projectreactor:reactor-test")
@ -17,10 +17,10 @@ dependencies { @@ -17,10 +17,10 @@ dependencies {
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.junit.platform:junit-platform-engine")
dockerTestImplementation("org.junit.platform:junit-platform-launcher")
dockerTestImplementation("org.testcontainers:couchbase")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
dockerTestImplementation("org.testcontainers:couchbase")
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase-reactive"))
}

8
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle
Unescape View File

@ -7,19 +7,19 @@ plugins { @@ -7,19 +7,19 @@ plugins {
description = "Spring Boot Data MongoDB smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation("io.projectreactor:reactor-test")
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
dockerTestImplementation("org.junit.platform:junit-platform-engine")
dockerTestImplementation("org.junit.platform:junit-platform-launcher")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:testcontainers")
dockerTestImplementation("org.testcontainers:mongodb")
dockerTestImplementation("org.testcontainers:testcontainers")
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb-reactive"))
implementation("io.projectreactor:reactor-core")
implementation("io.projectreactor:reactor-core")
}

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle
Unescape View File

@ -9,7 +9,7 @@ description = "Spring Boot Data R2DBC with Flyway smoke test" @@ -9,7 +9,7 @@ description = "Spring Boot Data R2DBC with Flyway smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("io.projectreactor:reactor-test")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:postgresql")

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle
Unescape View File

@ -9,7 +9,7 @@ description = "Spring Boot Data R2DBC with Liquibase smoke test" @@ -9,7 +9,7 @@ description = "Spring Boot Data R2DBC with Liquibase smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("io.projectreactor:reactor-test")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:postgresql")

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

@ -9,8 +9,8 @@ description = "Spring Boot Data Redis smoke test" @@ -9,8 +9,8 @@ description = "Spring Boot Data Redis smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("io.projectreactor:reactor-core")
dockerTestImplementation("io.projectreactor:reactor-test")
dockerTestImplementation("org.junit.jupiter:junit-jupiter")

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-kafka/build.gradle
Unescape View File

@ -8,14 +8,14 @@ description = "Spring Boot Kafka smoke test" @@ -8,14 +8,14 @@ description = "Spring Boot Kafka smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.awaitility:awaitility")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:kafka")
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-json"))
implementation("org.springframework.kafka:spring-kafka")
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
testImplementation("org.awaitility:awaitility")
testImplementation("org.springframework.kafka:spring-kafka-test") {

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

@ -8,7 +8,7 @@ description = "Spring Boot Pulsar smoke test" @@ -8,7 +8,7 @@ description = "Spring Boot Pulsar smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation("org.awaitility:awaitility")
dockerTestImplementation("org.testcontainers:junit-jupiter")

10
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle
Unescape View File

@ -7,15 +7,15 @@ plugins { @@ -7,15 +7,15 @@ plugins {
description = "Spring Boot Session Mongodb smoke test"
dependencies {
dockerTestImplementation("org.testcontainers:mongodb")
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:mongodb")
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-mongodb"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
implementation("org.springframework.session:spring-session-data-mongodb")
}

4
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle
Unescape View File

@ -8,13 +8,13 @@ description = "Spring Boot Session Mongodb smoke test" @@ -8,13 +8,13 @@ description = "Spring Boot Session Mongodb smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation("org.testcontainers:junit-jupiter")
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
implementation("org.springframework.session:spring-session-data-redis")
}

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle
Unescape View File

@ -9,7 +9,7 @@ description = "Spring Boot Session WebFlux MongoDB smoke test" @@ -9,7 +9,7 @@ description = "Spring Boot Session WebFlux MongoDB smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.testcontainers:junit-jupiter")
dockerTestImplementation("org.testcontainers:mongodb")

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle
Unescape View File

@ -9,7 +9,7 @@ description = "Spring Boot Session WebFlux Redis smoke test" @@ -9,7 +9,7 @@ description = "Spring Boot Session WebFlux Redis smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation("org.testcontainers:junit-jupiter")
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))

1
src/checkstyle/checkstyle-suppressions.xml
Unescape View File

@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
<suppress files="[\\/]spring-boot-smoke-tests[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="[\\/]spring-boot-smoke-tests[\\/]spring-boot-smoke-test-testng[\\/]" checks="SpringJUnit5" />
<suppress files="[\\/]spring-boot-test-support[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="[\\/]spring-boot-test-support-docker[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="[\\/]spring-boot-gradle-test-support[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="[\\/]src[\\/]dockerTest[\\/]java[\\/]" checks="JavadocPackage" />
<suppress files="[\\/]src[\\/]dockerTest[\\/]java[\\/]" checks="SpringJavadoc" message="\@since" />

Write Preview
Loading…
Cancel
Save