From 0959a40b0212d6f0a4f5040ac4911caf162cc9d5 Mon Sep 17 00:00:00 2001
From: mattirn <matti.rintanikkola@gmail.com>
Date: Fri, 1 Apr 2022 19:19:30 +0200
Subject: [PATCH] Upgrade Groovy to 4.0.1

---
 demo/pom.xml   |  8 ++++----
 groovy/pom.xml |  8 ++++----
 pom.xml        | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/demo/pom.xml b/demo/pom.xml
index de3a8470e..9b3c31fa6 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2020, the original author or authors.
+    Copyright (c) 2002-2022, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -111,17 +111,17 @@
         </dependency>
 
         <dependency>
-             <groupId>org.codehaus.groovy</groupId>
+             <groupId>org.apache.groovy</groupId>
              <artifactId>groovy</artifactId>
         </dependency>
 
         <dependency>
-             <groupId>org.codehaus.groovy</groupId>
+             <groupId>org.apache.groovy</groupId>
              <artifactId>groovy-json</artifactId>
         </dependency>
 
         <dependency>
-             <groupId>org.codehaus.groovy</groupId>
+             <groupId>org.apache.groovy</groupId>
              <artifactId>groovy-console</artifactId>
         </dependency>
 
diff --git a/groovy/pom.xml b/groovy/pom.xml
index c1189dc9e..79e2118d3 100644
--- a/groovy/pom.xml
+++ b/groovy/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2002-2020, the original author or authors.
+    Copyright (c) 2002-2022, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -30,15 +30,15 @@
             <artifactId>jline-console</artifactId>
         </dependency>
         <dependency>
-             <groupId>org.codehaus.groovy</groupId>
+             <groupId>org.apache.groovy</groupId>
              <artifactId>groovy</artifactId>
         </dependency>
         <dependency>
-             <groupId>org.codehaus.groovy</groupId>
+             <groupId>org.apache.groovy</groupId>
              <artifactId>groovy-json</artifactId>
         </dependency>
         <dependency>
-             <groupId>org.codehaus.groovy</groupId>
+             <groupId>org.apache.groovy</groupId>
              <artifactId>groovy-console</artifactId>
              <optional>true</optional>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 2d28db131..86720f4b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2002-2021, the original author or authors.
+    Copyright (c) 2002-2022, the original author or authors.
 
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
@@ -92,7 +92,7 @@
         <gogo.jline.version>1.1.8</gogo.jline.version>
         <slf4j.version>1.7.21</slf4j.version>
         <findbugs.version>3.0.2</findbugs.version>
-        <groovy.version>3.0.8</groovy.version>
+        <groovy.version>4.0.1</groovy.version>
         <ivy.version>2.5.0</ivy.version>
         <graal.version>19.3.1</graal.version>
 
@@ -240,19 +240,19 @@
             </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-json</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-console</artifactId>
                 <version>${groovy.version}</version>
             </dependency>