Testcontainers via test-resources version catalog (#508)

micronaut-projects · Feb 5, 2024 · 28fde4d · 28fde4d
1 parent 39fb2db
commit 28fde4d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/flyway/build.gradle b/flyway/build.gradle
@@ -27,9 +27,9 @@ dependencies {
     testImplementation mn.snakeyaml
 
     // Test Containers
-    testImplementation libs.test.containers
+    testImplementation(platform(mnTestResources.boms.testcontainers))
     testImplementation libs.test.containers.spock
-    testImplementation libs.test.containers.postgresql
+    testImplementation(mnTestResources.testcontainers.postgres)
 
     // Database
     testImplementation libs.postgresql.driver

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,6 +6,7 @@ micronaut-platform = "4.2.3"
 micronaut-test = "4.1.1"
 micronaut-serde = "2.7.1"
 micronaut-sql = "5.4.1"
+micronaut-test-resources="2.3.2"
 
 micronaut-gradle-plugin = "4.2.1"
 
@@ -17,7 +18,6 @@ persistence-api = '2.2'
 groovy = "4.0.17"
 spock = "2.3-groovy-4.0"
 
-testcontainers = "1.19.3"
 postgresql = "42.7.1"
 
 [libraries]
@@ -35,14 +35,12 @@ graal-svm = { module = "org.graalvm.nativeimage:svm", version.ref = "graal-svm"
 
 micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serde" }
 micronaut-sql = { module = "io.micronaut.sql:micronaut-sql-bom", version.ref = "micronaut-sql" }
+micronaut-test-resources = { module = "io.micronaut.testresources:micronaut-test-resources-bom", version.ref = "micronaut-test-resources" }
 
 gradle-micronaut = { module = "io.micronaut.gradle:micronaut-gradle-plugin", version.ref = "micronaut-gradle-plugin" }
 
 persistence-api = { module = 'javax.persistence:javax.persistence-api', version.ref = 'persistence-api'}
 
-test-containers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }
-test-containers-junit-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
-test-containers-spock = { module = "org.testcontainers:spock", version.ref = "testcontainers" }
-test-containers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
+test-containers-spock = { module = "org.testcontainers:spock" }
 
 postgresql-driver = { module = "org.postgresql:postgresql", version.ref = "postgresql" }
diff --git a/settings.gradle b/settings.gradle
@@ -23,5 +23,6 @@ micronautBuild {
     importMicronautCatalog()
     importMicronautCatalog("micronaut-serde")
     importMicronautCatalog("micronaut-sql")
+    importMicronautCatalog("micronaut-test-resources")
 }