diff --git a/elasticsearch/build.gradle.kts b/elasticsearch/build.gradle.kts index 5fb2c598..9169100c 100644 --- a/elasticsearch/build.gradle.kts +++ b/elasticsearch/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { implementation(mn.micronaut.jackson.databind) - testImplementation(libs.testcontainers.elasticsearch) + testImplementation(mnTestResources.testcontainers.elasticsearch) testImplementation(mn.groovy.json) testImplementation(mnSecurity.micronaut.security) testImplementation(mn.reactor) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 844fdbd6..83198780 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,13 +5,13 @@ micronaut-platform = "4.0.0-RC1" micronaut-security = "4.5.0" micronaut-logging = "1.0.0" micronaut-test = "4.0.0" +micronaut-test-resources="2.3.2" micronaut-gradle-plugin = "4.2.1" managed-elasticsearch = "8.12.0" graal-svm = "23.1.2" groovy = "4.0.15" spock = "2.3-groovy-4.0" -testcontainers = "1.19.3" slf4j = "2.0.11" awaitility = "4.2.0" apache-http-client = "4.5.14" @@ -22,6 +22,8 @@ apache-http-async-client = "4.1.5" micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'micronaut' } 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" } + jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j" } managed-elasticsearch-java = { module = "co.elastic.clients:elasticsearch-java", version.ref = "managed-elasticsearch" } managed-elasticsearch-rest-client = { module = "org.elasticsearch.client:elasticsearch-rest-client", version.ref = "managed-elasticsearch" } @@ -29,6 +31,5 @@ apache-http-client = { module = "org.apache.httpcomponents:httpclient", version. apache-http-async-client = { module = "org.apache.httpcomponents:httpasyncclient", version.ref = "apache-http-async-client" } graal-svm = { module = "org.graalvm.nativeimage:svm", version.ref = "graal-svm" } -testcontainers-elasticsearch = { module = "org.testcontainers:elasticsearch", version.ref = "testcontainers" } awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" } gradle-micronaut = { module = "io.micronaut.gradle:micronaut-gradle-plugin", version.ref = "micronaut-gradle-plugin" } diff --git a/settings.gradle b/settings.gradle index bdd5195e..b495a731 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,4 +22,5 @@ micronautBuild { useStandardizedProjectNames = true importMicronautCatalog() importMicronautCatalog("micronaut-security") + importMicronautCatalog("micronaut-test-resources") } diff --git a/test-suite-groovy/build.gradle.kts b/test-suite-groovy/build.gradle.kts index a48774b5..f5b8fbdc 100644 --- a/test-suite-groovy/build.gradle.kts +++ b/test-suite-groovy/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { testImplementation(mnTest.micronaut.test.spock) // tag::testcontainers-dependencies[] - testImplementation(libs.testcontainers.elasticsearch) + testImplementation(mnTestResources.testcontainers.elasticsearch) // end::testcontainers-dependencies[] testImplementation(libs.apache.http.client) testImplementation(libs.apache.http.async.client)