Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

testcontainers via test-resources version catalog #2038

Merged
merged 2 commits into from Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -5,6 +5,6 @@ plugins {
micronaut {
testResources {
clientTimeout = 300
version = libs.versions.micronaut.testresources.get()
version = libs.versions.micronaut.test.resources.get()
}
}
6 changes: 2 additions & 4 deletions function-aws/build.gradle.kts
Expand Up @@ -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)
}
8 changes: 2 additions & 6 deletions gradle/libs.versions.toml
Expand Up @@ -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"

Expand All @@ -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"

Expand All @@ -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
Expand All @@ -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" }

Expand Down Expand Up @@ -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" }
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Expand Up @@ -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")
}