You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/05/03 21:43:05 UTC
(grails-core) 01/03: Update forge generated apps for testcontainers 2.x
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 58ecbe29f2c752c67e5da2b958ac4bcfa28384ef
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Sun May 3 17:38:40 2026 -0400
Update forge generated apps for testcontainers 2.x
---
.../java/org/grails/forge/feature/database/TestContainers.java | 10 +++++-----
.../build/dependencies/GradleDependencyComparatorSpec.groovy | 4 ++--
.../org/grails/forge/feature/database/MongoSyncSpec.groovy | 2 +-
.../grails/forge/feature/database/TestContainersSpec.groovy | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/database/TestContainers.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/database/TestContainers.java
index 1f39980177..10b4b6e8d5 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/database/TestContainers.java
+++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/database/TestContainers.java
@@ -79,11 +79,11 @@ public class TestContainers implements Feature {
});
if (generatorContext.isFeaturePresent(Spock.class)) {
- generatorContext.addDependency(testContainerTestDependency("spock"));
+ generatorContext.addDependency(testContainerTestDependency("testcontainers-spock"));
}
if (generatorContext.isFeaturePresent(MongoFeature.class) || generatorContext.isFeaturePresent(MongoGorm.class)) {
- generatorContext.addDependency(testContainerTestDependency("mongodb"));
+ generatorContext.addDependency(testContainerTestDependency("testcontainers-mongodb"));
}
}
@@ -98,11 +98,11 @@ public class TestContainers implements Feature {
@NonNull
private static Optional<String> artifactIdForDriverFeature(@NonNull DatabaseDriverFeature driverFeature) {
if (driverFeature instanceof MySQL) {
- return Optional.of("mysql");
+ return Optional.of("testcontainers-mysql");
} else if (driverFeature instanceof PostgreSQL) {
- return Optional.of("postgresql");
+ return Optional.of("testcontainers-postgresql");
} else if (driverFeature instanceof SQLServer) {
- return Optional.of("mssqlserver");
+ return Optional.of("testcontainers-mssqlserver");
}
return Optional.empty();
}
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/build/dependencies/GradleDependencyComparatorSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/build/dependencies/GradleDependencyComparatorSpec.groovy
index 61f790a2e1..8cef4463cc 100644
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/build/dependencies/GradleDependencyComparatorSpec.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/build/dependencies/GradleDependencyComparatorSpec.groovy
@@ -44,7 +44,7 @@ class GradleDependencyComparatorSpec extends Specification {
dep(Dependency.builder().groupId("org.testcontainers").artifactId("testcontainers").testImplementation(), ctx),
dep(Dependency.builder().groupId("com.mysql").artifactId("mysql-connector-j").runtimeOnly(), ctx),
dep(Dependency.builder().groupId("org.testcontainers").artifactId("junit-jupiter").testImplementation(), ctx),
- dep(Dependency.builder().groupId("org.testcontainers").artifactId("mysql").testImplementation(), ctx),
+ dep(Dependency.builder().groupId("org.testcontainers").artifactId("testcontainers-mysql").testImplementation(), ctx),
dep(Dependency.builder().groupId("ch.qos.logback").artifactId("logback-classic").runtimeOnly(), ctx)]
when:
@@ -62,7 +62,7 @@ class GradleDependencyComparatorSpec extends Specification {
"${str(dependencies[8])}" == 'runtimeOnly "ch.qos.logback:logback-classic"'
"${str(dependencies[9])}" == 'runtimeOnly "com.mysql:mysql-connector-j"'
"${str(dependencies[10])}" == 'testImplementation "org.testcontainers:junit-jupiter"'
- "${str(dependencies[11])}" == 'testImplementation "org.testcontainers:mysql"'
+ "${str(dependencies[11])}" == 'testImplementation "org.testcontainers:testcontainers-mysql"'
"${str(dependencies[12])}" == 'testImplementation "org.testcontainers:testcontainers"'
}
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/MongoSyncSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/MongoSyncSpec.groovy
index 90801f13d1..fec83fbd4b 100644
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/MongoSyncSpec.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/MongoSyncSpec.groovy
@@ -53,6 +53,6 @@ class MongoSyncSpec extends ApplicationContextSpec implements CommandOutputFixtu
then:
template.contains('implementation "org.mongodb:mongodb-driver-sync"')
- template.contains('testImplementation "org.testcontainers:mongodb"')
+ template.contains('testImplementation "org.testcontainers:testcontainers-mongodb"')
}
}
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/TestContainersSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/TestContainersSpec.groovy
index 3f52301cb8..ca5efb7c3f 100644
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/TestContainersSpec.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/TestContainersSpec.groovy
@@ -36,7 +36,7 @@ class TestContainersSpec extends ApplicationContextSpec {
.render()
then:
- template.contains('testImplementation "org.testcontainers:mysql"')
+ template.contains('testImplementation "org.testcontainers:testcontainers-mysql"')
template.contains('testImplementation "org.testcontainers:testcontainers"')
}
@@ -47,7 +47,7 @@ class TestContainersSpec extends ApplicationContextSpec {
.render()
then:
- template.contains('testImplementation "org.testcontainers:postgresql"')
+ template.contains('testImplementation "org.testcontainers:testcontainers-postgresql"')
template.contains('testImplementation "org.testcontainers:testcontainers"')
}
@@ -58,7 +58,7 @@ class TestContainersSpec extends ApplicationContextSpec {
.render()
then:
- template.contains('testImplementation "org.testcontainers:mssqlserver"')
+ template.contains('testImplementation "org.testcontainers:testcontainers-mssqlserver"')
template.contains('testImplementation "org.testcontainers:testcontainers"')
}
@@ -69,7 +69,7 @@ class TestContainersSpec extends ApplicationContextSpec {
.render()
then:
- template.contains('testImplementation "org.testcontainers:mongodb"')
+ template.contains('testImplementation "org.testcontainers:testcontainers-mongodb"')
template.contains('testImplementation "org.testcontainers:testcontainers"')
}
@@ -80,7 +80,7 @@ class TestContainersSpec extends ApplicationContextSpec {
.render()
then:
- template.contains('testImplementation "org.testcontainers:mongodb"')
+ template.contains('testImplementation "org.testcontainers:testcontainers-mongodb"')
template.contains('testImplementation "org.testcontainers:testcontainers"')
}