From 6eeb8925692de391f12f678586206ad8458b3280 Mon Sep 17 00:00:00 2001
From: Dean Wette <wetted@unityfoundation.io>
Date: Mon, 5 Feb 2024 03:01:14 -0600
Subject: [PATCH] testcontainers via test-resources version catalog (#2038)

* testcontainers via test-resources version catalog

* fix for changed catalog property
---
 ...io.micronaut.build.internal.aws-tests-resources.gradle | 2 +-
 function-aws/build.gradle.kts                             | 6 ++----
 gradle/libs.versions.toml                                 | 8 ++------
 settings.gradle.kts                                       | 1 +
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.aws-tests-resources.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.aws-tests-resources.gradle
index 2425c3532f..44aee46107 100644
--- a/buildSrc/src/main/groovy/io.micronaut.build.internal.aws-tests-resources.gradle
+++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.aws-tests-resources.gradle
@@ -5,6 +5,6 @@ plugins {
 micronaut {
     testResources {
         clientTimeout = 300
-        version = libs.versions.micronaut.testresources.get()
+        version = libs.versions.micronaut.test.resources.get()
     }
 }
diff --git a/function-aws/build.gradle.kts b/function-aws/build.gradle.kts
index 915e9d5c48..f435592210 100644
--- a/function-aws/build.gradle.kts
+++ b/function-aws/build.gradle.kts
@@ -7,10 +7,8 @@ dependencies {
     api(libs.managed.aws.lambda.core)
     implementation(mn.micronaut.json.core)
     testImplementation(mnMongo.micronaut.mongo.sync)
-    testImplementation(platform(libs.testcontainers.bom))
-    testImplementation(libs.testcontainers.spock)
-    testImplementation(libs.testcontainers.mongodb)
-    testImplementation(libs.testcontainers)
+    testImplementation(mnTestResources.testcontainers.core)
+    testImplementation(mnTestResources.testcontainers.mongodb)
     testImplementation(projects.micronautAwsLambdaEventsSerde)
     testImplementation(mnSerde.micronaut.serde.jackson)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 59b81450d2..16cee37659 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,6 @@
 micronaut = "4.3.3"
 micronaut-docs = "2.0.0"
 micronaut-test = "4.2.0"
-micronaut-testresources = "2.3.1"
 groovy = "4.0.15"
 spock = "2.3-groovy-4.0"
 
@@ -20,6 +19,7 @@ micronaut-reactor = "3.2.1"
 micronaut-security = "4.6.0"
 micronaut-serde = "2.8.1"
 micronaut-servlet = "4.5.0"
+micronaut-test-resources="2.3.2"
 micronaut-views = "5.1.0"
 micronaut-validation = "4.4.0"
 
@@ -35,7 +35,6 @@ managed-aws-serverless-core = '1.9.3'
 micronaut-starter = "3.9.2"
 slf4j = "2.0.11"
 servlet-api = "2.5"
-testcontainers = "1.19.3"
 javapoet = "1.13.0"
 
 # The following version should probably
@@ -60,6 +59,7 @@ micronaut-reactor = { module = "io.micronaut.reactor:micronaut-reactor-bom", ver
 micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serde" }
 micronaut-servlet = { module = "io.micronaut.servlet:micronaut-servlet-bom", version.ref = "micronaut-servlet" }
 micronaut-security = { module = "io.micronaut.security:micronaut-security-bom", version.ref = "micronaut-security" }
+micronaut-test-resources = { module = "io.micronaut.testresources:micronaut-test-resources-bom", version.ref = "micronaut-test-resources" }
 micronaut-views = { module = "io.micronaut.views:micronaut-views-bom", version.ref = "micronaut-views" }
 micronaut-validation = { module = "io.micronaut.validation:micronaut-validation-bom", version.ref = "micronaut-validation" }
 
@@ -115,10 +115,6 @@ managed-awssdk-secretsmanager = { module = 'software.amazon.awssdk:secretsmanage
 managed-jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref = 'slf4j' }
 
 servlet-api = { module = 'javax.servlet:servlet-api', version.ref = 'servlet-api' }
-testcontainers-bom = { module = 'org.testcontainers:testcontainers-bom', version.ref = 'testcontainers' }
-testcontainers = { module = 'org.testcontainers:testcontainers' }
-testcontainers-mongodb = { module = 'org.testcontainers:mongodb' }
-testcontainers-spock = { module = 'org.testcontainers:spock' }
 # Gradle
 
 gradle-micronaut = { module = "io.micronaut.gradle:micronaut-gradle-plugin", version.ref = "micronaut-gradle-plugin" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dbe85b3005..23ec7ffe85 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -60,6 +60,7 @@ configure<io.micronaut.build.MicronautBuildSettingsExtension> {
     importMicronautCatalog("micronaut-serde")
     importMicronautCatalog("micronaut-servlet")
     importMicronautCatalog("micronaut-security")
+    importMicronautCatalog("micronaut-test-resources")
     importMicronautCatalog("micronaut-views")
     importMicronautCatalog("micronaut-validation")
 }