From b6ecfb62537795146ee089c521cdd8703f3ee466 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 10 Jan 2024 14:23:12 +0100
Subject: [PATCH] Upgrade Groovy to 4.x to support building on JDK 21

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c83f03c5..7804d02dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
         <ant.build.javac.target>${javac.target}</ant.build.javac.target>
 
         <min.required.maven.version>3.5.0</min.required.maven.version>
-        <groovy.version>3.0.11</groovy.version>
+        <groovy.version>4.0.17</groovy.version>
         <bouncycastle.version>1.77</bouncycastle.version>
             <!-- NOTE: upgrading slf4j beyond this version causes
             
@@ -411,12 +411,12 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-ant</artifactId>
                 <version>${groovy.version}</version>
                 <exclusions>
@@ -852,7 +852,7 @@
                 <plugin>
                     <groupId>org.codehaus.gmavenplus</groupId>
                     <artifactId>gmavenplus-plugin</artifactId>
-                    <version>1.13.1</version>
+                    <version>3.0.2</version>
                     <dependencies>
                           <!-- referenced indirectly by groovy-ant -->
                         <dependency>
@@ -882,12 +882,12 @@
                         </dependency>
 
                         <dependency>
-                            <groupId>org.codehaus.groovy</groupId>
+                            <groupId>org.apache.groovy</groupId>
                             <artifactId>groovy</artifactId>
                             <version>${groovy.version}</version>
                         </dependency>
                         <dependency>
-                            <groupId>org.codehaus.groovy</groupId>
+                            <groupId>org.apache.groovy</groupId>
                             <artifactId>groovy-ant</artifactId>
                             <version>${groovy.version}</version>
                             <exclusions>