From ed4d6be0bc5062ebd375ca954d81895489f8824d Mon Sep 17 00:00:00 2001
From: Masatake Iwasaki <iwasakims@apache.org>
Date: Tue, 3 Mar 2026 14:43:43 +0900
Subject: [PATCH] BIGTOP-4519. Upgrade Groovy to 3.0.25.

---
 bigtop-tests/smoke-tests/build.gradle | 2 +-
 bigtop.bom                            | 2 +-
 bigtop_toolchain/manifests/groovy.pp  | 4 ++--
 build.gradle                          | 2 +-
 pom.xml                               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bigtop-tests/smoke-tests/build.gradle b/bigtop-tests/smoke-tests/build.gradle
index 011e5500f0..718830fd8e 100644
--- a/bigtop-tests/smoke-tests/build.gradle
+++ b/bigtop-tests/smoke-tests/build.gradle
@@ -27,7 +27,7 @@ subprojects {
     }
   }
 
-  ext.groovyVersion = '2.5.4'
+  ext.groovyVersion = '3.0.25'
   ext.hadoopVersion = '2.7.4'
   ext.hbaseVersion = '1.1.9'
   ext.solrVersion = '8.11.4'
diff --git a/bigtop.bom b/bigtop.bom
index 0a958d9cdc..decb6813ab 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -258,7 +258,7 @@ bigtop {
     'bigtop-groovy' {
       name    = 'bigtop-groovy'
       relNotes = "Groovy: a dynamic language for the Java platform"
-      version { base = '2.5.4'; pkg = '2.5.4'; release = 1 }
+      version { base = '3.0.25'; pkg = '3.0.25'; release = 1 }
       tarball { destination = "$name-${version.base}.tar.gz";
                 source      = "apache-groovy-binary-${version.base}.zip" }
       url     { download_path = "/groovy/${version.base}/distribution/"
diff --git a/bigtop_toolchain/manifests/groovy.pp b/bigtop_toolchain/manifests/groovy.pp
index 39f33e847d..b696320746 100644
--- a/bigtop_toolchain/manifests/groovy.pp
+++ b/bigtop_toolchain/manifests/groovy.pp
@@ -17,11 +17,11 @@
 
   require bigtop_toolchain::packages
 
-  $groovy_version = '2.5.4'
+  $groovy_version = '3.0.25'
   $groovy = "apache-groovy-binary-${groovy_version}"
 
   exec { 'Download Groovy':
-    command => "/usr/bin/wget https://dl.bintray.com/groovy/maven/${groovy}.zip",
+    command => "/usr/bin/wget https://archive.apache.org/dist/groovy/${groovy_version}/distribution/${groovy}.zip",
     cwd     => "/usr/src",
     unless  => "/usr/bin/test -f /usr/src/${groovy}.zip",
   } ~>
diff --git a/build.gradle b/build.gradle
index 53f93312b0..e97b1a6ca9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -166,7 +166,7 @@ project(':itest-common') {
   description = """iTest: system and integration testing in the cloud"""
 
   dependencies {
-    compile group: 'org.codehaus.groovy', name: 'groovy-all', version:'2.5.4'
+    compile group: 'org.codehaus.groovy', name: 'groovy-all', version:'3.0.25'
     compile group: 'junit', name: 'junit', version:'4.11'
     compile group: 'commons-logging', name: 'commons-logging', version:'1.1'
     compile group: 'org.apache.ant', name: 'ant', version:'1.8.2'
diff --git a/pom.xml b/pom.xml
index 0e599e49c4..9cc911c38f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 
     <itest-common.version>${project.version}</itest-common.version>
 
-    <groovy.version>2.5.4</groovy.version>
+    <groovy.version>3.0.25</groovy.version>
     <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
     <maven-failsafe-plugin.version>2.12</maven-failsafe-plugin.version>
     <groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>