Testcontainers via test-resources version catalog (#417)

micronaut-projects · Feb 5, 2024 · 823196a · 823196a
1 parent b99f769
commit 823196a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/cassandra/build.gradle.kts b/cassandra/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     testImplementation(libs.managed.datastax.cassandra.driver.metrics.micrometer)
     testImplementation(mnTest.micronaut.test.spock)
     testImplementation(mn.reactor)
-    testImplementation(libs.testcontainers.spock)
+    testImplementation(platform(mnTestResources.boms.testcontainers))
     testImplementation(libs.testcontainers.cassandra)
     testImplementation(mn.micronaut.management)
     testImplementation(mnMicrometer.micronaut.micrometer.core)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,13 +6,13 @@ micronaut-test = "4.0.2"
 micronaut-logging = "1.1.2"
 micronaut-reactor = "3.2.1"
 micronaut-micrometer = "5.3.0"
+micronaut-test-resources="2.3.2"
 micronaut-gradle-plugin = "4.2.1"
 
 managed-datastax-cassandra-driver = "4.17.0"
 
 groovy = "4.0.14"
 spock = "2.3-groovy-4.0"
-testcontainers = "1.19.4"
 system-stubs = "2.1.6"
 bcpkix = "1.77"
 
@@ -21,14 +21,14 @@ bcpkix = "1.77"
 micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'micronaut' }
 micronaut-micrometer = { module = "io.micronaut.micrometer:micronaut-micrometer-bom", version.ref = "micronaut-micrometer" }
 micronaut-reactor = { module = "io.micronaut.reactor:micronaut-reactor-bom", version.ref = "micronaut-reactor" }
+micronaut-test-resources = { module = "io.micronaut.testresources:micronaut-test-resources-bom", version.ref = "micronaut-test-resources" }
 
 managed-datastax-cassandra-driver-core = { module = "com.datastax.oss:java-driver-core", version.ref = "managed-datastax-cassandra-driver" }
 managed-datastax-cassandra-driver-mapper-processor = { module = "com.datastax.oss:java-driver-mapper-processor", version.ref = "managed-datastax-cassandra-driver" }
 managed-datastax-cassandra-driver-metrics-micrometer = { module = "com.datastax.oss:java-driver-metrics-micrometer", version.ref = "managed-datastax-cassandra-driver" }
 
 bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bcpkix" }
 system-stubs = { module = "uk.org.webcompere:system-stubs-core", version.ref = "system-stubs" }
-testcontainers-cassandra = { module = "org.testcontainers:cassandra", version.ref = "testcontainers" }
-testcontainers-spock = { module = "org.testcontainers:spock", version.ref = "testcontainers" }
+testcontainers-cassandra = { module = "org.testcontainers:cassandra" }
 
 gradle-micronaut = { module = "io.micronaut.gradle:micronaut-gradle-plugin", version.ref = "micronaut-gradle-plugin" }
diff --git a/settings.gradle b/settings.gradle
@@ -24,4 +24,5 @@ micronautBuild {
     importMicronautCatalog()
     importMicronautCatalog("micronaut-micrometer")
     importMicronautCatalog("micronaut-reactor")
+    importMicronautCatalog("micronaut-test-resources")
 }
diff --git a/tests/cassandra-jackson/build.gradle.kts b/tests/cassandra-jackson/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     testImplementation(mn.micronaut.management)
     testImplementation(mnReactor.micronaut.reactor)
 
-    testImplementation(libs.testcontainers.spock)
+    testImplementation(platform(mnTestResources.boms.testcontainers))
     testImplementation(libs.testcontainers.cassandra)
 
     testRuntimeOnly(mnLogging.logback.classic)

diff --git a/tests/cassandra-ssl/build.gradle.kts b/tests/cassandra-ssl/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     testImplementation(mnReactor.micronaut.reactor)
 
     testImplementation(libs.bcpkix)
-    testImplementation(libs.testcontainers.spock)
+    testImplementation(platform(mnTestResources.boms.testcontainers))
     testImplementation(libs.testcontainers.cassandra)
 
     testRuntimeOnly(mnLogging.logback.classic)