From 97fc0c1fbf5807987b67dc380ca1f39b4767dbc6 Mon Sep 17 00:00:00 2001
From: KMGeon <103854287+KMGeon@users.noreply.github.com>
Date: Wed, 11 Mar 2026 00:15:31 +0900
Subject: [PATCH] Update Groovy version to 5.0.4

Closes gh-5289

Signed-off-by: KMGeon <103854287+KMGeon@users.noreply.github.com>
---
 pom.xml                                                       | 2 +-
 spring-batch-samples/pom.xml                                  | 4 ++--
 .../batch/samples/misc/groovy/job/groovyJob.xml               | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index edeea1e099..1031f6e1b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
 		<spring-rabbit.version>${spring-amqp.version}</spring-rabbit.version>
 		<quartz.version>2.5.1</quartz.version>
 		<prometheus-metrics-exporter-pushgateway>1.4.2</prometheus-metrics-exporter-pushgateway>
-		<groovy.version>3.0.25</groovy.version> <!-- change to org.apache.groovy:groovy + update to latest 5.0.2 -->
+		<groovy.version>5.0.4</groovy.version>
         <logback.version>1.5.21</logback.version>
 
 		<!-- documentation dependencies -->
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index c69500c2bd..3a2a086720 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -282,13 +282,13 @@
 			<version>${hsqldb.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
+			<groupId>org.apache.groovy</groupId>
 			<artifactId>groovy</artifactId>
 			<version>${groovy.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
+			<groupId>org.apache.groovy</groupId>
 			<artifactId>groovy-ant</artifactId>
 			<version>${groovy.version}</version>
 			<scope>test</scope>
diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/groovy/job/groovyJob.xml b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/groovy/job/groovyJob.xml
index f841d2166e..94afd46360 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/groovy/job/groovyJob.xml
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/misc/groovy/job/groovyJob.xml
@@ -31,6 +31,7 @@
 
 	<lang:groovy id="unzip-script">
 		<lang:inline-script>
+			import groovy.ant.AntBuilder
 			class UnzipTasklet {
 			void execute() {
 			def ant = new AntBuilder()
@@ -43,6 +44,7 @@
 
 	<lang:groovy id="zip-script">
 		<lang:inline-script>
+			import groovy.ant.AntBuilder
 			class ZipTasklet {
 			void execute() {
 			def ant = new AntBuilder()