From ab7b57939cebe0e95c2f9919381549d28aa4b6b4 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 20 Sep 2022 13:32:48 -0400 Subject: [PATCH] Use Testcontainers BOM * Rework `MongoDbContainerTest` to explicit `MongoDBContainer` --- build.gradle | 7 +++++-- .../integration/mongodb/MongoDbContainerTest.java | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 17429baabc..7dde91ff65 100644 --- a/build.gradle +++ b/build.gradle @@ -164,6 +164,7 @@ allprojects { mavenBom "io.micrometer:micrometer-bom:$micrometerVersion" mavenBom "io.micrometer:micrometer-tracing-bom:$micrometerTracingVersion" mavenBom "org.apache.camel:camel-bom:$camelVersion" + mavenBom "org.testcontainers:testcontainers-bom:$testcontainersVersion" } } @@ -268,7 +269,7 @@ configure(javaProjects) { subproject -> testImplementation 'org.jetbrains.kotlin:kotlin-reflect' testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' testImplementation 'io.projectreactor:reactor-test' - testImplementation "org.testcontainers:junit-jupiter:$testcontainersVersion" + testImplementation 'org.testcontainers:junit-jupiter' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' @@ -719,7 +720,7 @@ project('spring-integration-jdbc') { testImplementation "org.postgresql:postgresql:$postgresVersion" testImplementation "mysql:mysql-connector-java:$mysqlVersion" testImplementation "org.apache.commons:commons-dbcp2:$commonsDbcp2Version" - testImplementation "org.testcontainers:mysql:$testcontainersVersion" + testImplementation 'org.testcontainers:mysql' testRuntimeOnly 'com.fasterxml.jackson.core:jackson-databind' } @@ -801,6 +802,8 @@ project('spring-integration-mongodb') { } optionalApi "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" optionalApi "org.mongodb:mongodb-driver-reactivestreams:$mongoDriverVersion" + + testImplementation 'org.testcontainers:mongodb' } } diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java index b5b705cba5..640bd7b91a 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java @@ -22,7 +22,7 @@ import org.bson.Document; import org.bson.UuidRepresentation; import org.bson.conversions.Bson; import org.junit.jupiter.api.BeforeAll; -import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Testcontainers; import org.springframework.dao.DataAccessException; @@ -66,8 +66,7 @@ import com.mongodb.client.MongoCollection; @Testcontainers(disabledWithoutDocker = true) public interface MongoDbContainerTest { - GenericContainer MONGO_CONTAINER = new GenericContainer<>("mongo:5.0.9") - .withExposedPorts(27017); + MongoDBContainer MONGO_CONTAINER = new MongoDBContainer("mongo:5.0.9"); @BeforeAll static void startContainer() {