This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new a876e46f44 Improved: Upgrade Apache Groovy to 6.0.0 (OFBIZ-13725)
a876e46f44 is described below
commit a876e46f4413430ee19e734b389043979d749cea
Author: Mridul Pathak <[email protected]>
AuthorDate: Sat Oct 24 14:42:27 2026 +0530
Improved: Upgrade Apache Groovy to 6.0.0 (OFBIZ-13725)
Upgrades groovy-all from 5.1.3 to 6.0.0 on trunk. Groovy 6 needs Java 17,
which matches the trunk baseline, and OFBiz Groovy sources and scripts need no
changes. CodeNarc 4.0.0 keeps resolving its own Groovy 5 runtime.
groovy-all 6.0.0 adds groovy-grape-maven, a second @Grab engine built on
Maven Resolver 4.0.0-rc-6 that brings 27 more jars to the runtime classpath.
OFBiz does not use @Grab and GrapeIvy stays the default engine, so the module
is excluded.
---
dependencies.gradle | 6 +++++-
gradle/libs.versions.toml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dependencies.gradle b/dependencies.gradle
index fa58d1ea1b..56ca2d9510 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -65,7 +65,11 @@ dependencies {
implementation libs.bundles.batik
implementation libs.fop
implementation libs.clojure
- implementation libs.groovy.all
+ implementation(libs.groovy.all) {
+ // Groovy 6 adds a second @Grab engine on Maven Resolver 4 (27 extra
jars). OFBiz never uses @Grab and
+ // GrapeIvy stays the default engine, so keep the runtime classpath as
it was with Groovy 5.
+ exclude group: 'org.apache.groovy', module: 'groovy-grape-maven'
+ }
implementation libs.freemarker
implementation libs.esapi
implementation libs.spring.test
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 71663c2021..2f201af404 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -67,7 +67,7 @@ axis2 = "1.8.2"
batik = "1.19"
fop = "2.11"
clojure = "1.12.6"
-groovy-all = "5.1.3"
+groovy-all = "6.0.0"
# Remember to change the version number in FreeMarkerWorker class when
upgrading. See OFBIZ-10019 if >= 2.4
freemarker = "2.3.35"
esapi = "2.7.0.0"
