You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ja...@apache.org on 2026/04/25 16:11:11 UTC
(grails-core) 04/07: Drop forge groovyVersion override and let micronaut-platform manage it
This is an automated email from the ASF dual-hosted git repository.
jamesfredley pushed a commit to branch upgrade/gradle-9.3.1
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 014355310b6b8f4700d4f5f46e686ee181441565
Author: James Fredley <ja...@users.noreply.github.com>
AuthorDate: Sat Apr 25 11:22:19 2026 -0400
Drop forge groovyVersion override and let micronaut-platform manage it
Removes the explicit ':$groovyVersion' coordinate from every forge build
script and deletes groovyVersion=4.0.31 from grails-forge/gradle.properties.
Also drops the eachDependency { details.useVersion(groovyVersion) }
resolutionStrategy override in grails-forge-api, grails-forge-cli, and
grails-forge-core (the spock-core override is preserved - that one is still
needed because the micronaut-platform BOM's spock version differs from ours).
Files touched:
* grails-forge/gradle.properties
* grails-forge/gradle/doc-config.gradle (4 documentation entries)
* grails-forge/test-core/build.gradle
* grails-forge/grails-forge-api/build.gradle
* grails-forge/grails-forge-cli/build.gradle
* grails-forge/grails-forge-core/build.gradle
The forge composite build already imports the micronaut-platform 4.10.10
BOM in every consumer module, which transitively manages org.apache.groovy
artifacts via groovy-bom. With the override removed, Gradle's conflict
resolution lets the BOM-managed version win for forge:
org.apache.groovy:groovy-bom -> 4.0.28
org.apache.groovy:groovy -> 4.0.28
org.apache.groovy:groovy-test-> 4.0.28
(Verified with gradle :grails-forge-api:dependencies --configuration
testRuntimeClasspath.) Forge now tracks the Groovy version Micronaut
4.10.10 was built against (4.0.28) instead of the artificially-pinned
4.0.31 that was being forced. grails-core itself stays on 4.0.31 - the
two builds are independent composite projects with their own platform
choices, exactly as jdaugherty noted in the PR #15365 review thread on
test-core/build.gradle line 62.
Verified: gradle :grails-forge-api:compileTestGroovy
:grails-forge-cli:compileTestGroovy :grails-forge-core:compileTestGroovy
:test-core:compileTestGroovy succeeds (exit 0).
Assisted-by: claude-code:claude-opus-4-7
---
grails-forge/gradle.properties | 1 -
grails-forge/gradle/doc-config.gradle | 8 ++++----
grails-forge/grails-forge-api/build.gradle | 7 ++-----
grails-forge/grails-forge-cli/build.gradle | 7 ++-----
grails-forge/grails-forge-core/build.gradle | 7 ++-----
grails-forge/test-core/build.gradle | 4 ++--
6 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/grails-forge/gradle.properties b/grails-forge/gradle.properties
index a5879c7549..0a3e6f6690 100644
--- a/grails-forge/gradle.properties
+++ b/grails-forge/gradle.properties
@@ -32,7 +32,6 @@ cglibVersion=3.3.0
byteBuddyVersion=1.15.11
commonsCompressVersion=1.27.1
gradleSdkvendorPluginVersion=3.0.0
-groovyVersion=4.0.31
jacksonDatabindVersion=2.18.3
# match the jansi version in grails-bom
jansiVersion=2.4.2
diff --git a/grails-forge/gradle/doc-config.gradle b/grails-forge/gradle/doc-config.gradle
index bda18f36c1..323a535c5b 100644
--- a/grails-forge/gradle/doc-config.gradle
+++ b/grails-forge/gradle/doc-config.gradle
@@ -24,10 +24,10 @@ groovydocEnhancer {
}
dependencies {
- documentation "org.apache.groovy:groovy-templates:$groovyVersion"
- documentation "org.apache.groovy:groovy-dateutil:$groovyVersion"
- documentation "org.apache.groovy:groovy-ant:$groovyVersion"
- documentation "org.apache.groovy:groovy-groovydoc:$groovyVersion"
+ documentation 'org.apache.groovy:groovy-templates'
+ documentation 'org.apache.groovy:groovy-dateutil'
+ documentation 'org.apache.groovy:groovy-ant'
+ documentation 'org.apache.groovy:groovy-groovydoc'
}
tasks.withType(Groovydoc).configureEach { Groovydoc gdoc ->
diff --git a/grails-forge/grails-forge-api/build.gradle b/grails-forge/grails-forge-api/build.gradle
index dd65e70111..9a30a64ec1 100644
--- a/grails-forge/grails-forge-api/build.gradle
+++ b/grails-forge/grails-forge-api/build.gradle
@@ -62,7 +62,7 @@ dependencies {
testCompileOnly 'io.micronaut:micronaut-inject-groovy'
- testImplementation "org.apache.groovy:groovy:$groovyVersion"
+ testImplementation 'org.apache.groovy:groovy'
testImplementation "org.spockframework:spock-core:$spockVersion", {
exclude group: 'org.apache.groovy', module: 'groovy-all'
}
@@ -70,7 +70,7 @@ dependencies {
testImplementation "cglib:cglib-nodep:$cglibVersion"
testImplementation "org.objenesis:objenesis:$objenesisVersion"
testRuntimeOnly "ch.qos.logback:logback-classic:$logbackClassicVersion"
- testImplementation "org.apache.groovy:groovy-test:$groovyVersion"
+ testImplementation 'org.apache.groovy:groovy-test'
}
apply {
@@ -83,9 +83,6 @@ apply {
configurations.configureEach {
resolutionStrategy {
eachDependency { DependencyResolveDetails details ->
- if (details.requested.group == 'org.apache.groovy') {
- details.useVersion(groovyVersion)
- }
if (details.requested.name == 'spock-core') {
details.useVersion(spockVersion)
}
diff --git a/grails-forge/grails-forge-cli/build.gradle b/grails-forge/grails-forge-cli/build.gradle
index 73e7d729a4..0c45e85957 100644
--- a/grails-forge/grails-forge-cli/build.gradle
+++ b/grails-forge/grails-forge-cli/build.gradle
@@ -100,7 +100,7 @@ dependencies {
testImplementation 'org.testcontainers:spock'
testCompileOnly 'io.micronaut:micronaut-inject-groovy'
- testImplementation "org.apache.groovy:groovy:$groovyVersion"
+ testImplementation 'org.apache.groovy:groovy'
testImplementation "org.spockframework:spock-core:$spockVersion", {
exclude group: 'org.apache.groovy', module: 'groovy-all'
}
@@ -108,7 +108,7 @@ dependencies {
testImplementation "cglib:cglib-nodep:$cglibVersion"
testImplementation "org.objenesis:objenesis:$objenesisVersion"
testRuntimeOnly "ch.qos.logback:logback-classic:$logbackClassicVersion"
- testImplementation "org.apache.groovy:groovy-test:$groovyVersion"
+ testImplementation 'org.apache.groovy:groovy-test'
}
rocker {
@@ -160,9 +160,6 @@ jarTask.configure { Jar it ->
configurations.configureEach {
resolutionStrategy {
eachDependency { DependencyResolveDetails details ->
- if (details.requested.group == 'org.apache.groovy') {
- details.useVersion(groovyVersion)
- }
if (details.requested.name == 'spock-core') {
details.useVersion(spockVersion)
}
diff --git a/grails-forge/grails-forge-core/build.gradle b/grails-forge/grails-forge-core/build.gradle
index 5e8a83be15..086ace9544 100644
--- a/grails-forge/grails-forge-core/build.gradle
+++ b/grails-forge/grails-forge-core/build.gradle
@@ -67,7 +67,7 @@ dependencies {
testCompileOnly 'io.micronaut:micronaut-inject-groovy'
- testImplementation "org.apache.groovy:groovy:$groovyVersion"
+ testImplementation 'org.apache.groovy:groovy'
testImplementation "org.spockframework:spock-core:$spockVersion", {
exclude group: 'org.apache.groovy', module: 'groovy-all'
}
@@ -75,7 +75,7 @@ dependencies {
testImplementation "cglib:cglib-nodep:$cglibVersion"
testImplementation "org.objenesis:objenesis:$objenesisVersion"
testRuntimeOnly "ch.qos.logback:logback-classic:$logbackClassicVersion"
- testImplementation "org.apache.groovy:groovy-test:$groovyVersion"
+ testImplementation 'org.apache.groovy:groovy-test'
}
@@ -136,9 +136,6 @@ nohttp {
configurations.configureEach {
resolutionStrategy {
eachDependency { DependencyResolveDetails details ->
- if (details.requested.group == 'org.apache.groovy') {
- details.useVersion(groovyVersion)
- }
if (details.requested.name == 'spock-core') {
details.useVersion(spockVersion)
}
diff --git a/grails-forge/test-core/build.gradle b/grails-forge/test-core/build.gradle
index 6503a7d7cb..0d633982c7 100644
--- a/grails-forge/test-core/build.gradle
+++ b/grails-forge/test-core/build.gradle
@@ -59,7 +59,7 @@ dependencies {
testCompileOnly 'io.micronaut:micronaut-inject-groovy'
- testImplementation "org.apache.groovy:groovy:$groovyVersion"
+ testImplementation 'org.apache.groovy:groovy'
testImplementation "org.spockframework:spock-core:$spockVersion", {
exclude group: 'org.apache.groovy', module: 'groovy-all'
}
@@ -67,7 +67,7 @@ dependencies {
testImplementation "cglib:cglib-nodep:$cglibVersion"
testImplementation "org.objenesis:objenesis:$objenesisVersion"
testRuntimeOnly "ch.qos.logback:logback-classic:$logbackClassicVersion"
- testImplementation "org.apache.groovy:groovy-test:$groovyVersion"
+ testImplementation 'org.apache.groovy:groovy-test'
}
apply {