From 2c1afc4b75730fe1d1625dec4899d3490738ede3 Mon Sep 17 00:00:00 2001
From: Robbie Gemmell <robbie@apache.org>
Date: Wed, 2 Feb 2022 15:08:38 +0000
Subject: [PATCH] ARTEMIS-3667: update to Groovy 4.0.0

---
 pom.xml                           |  2 +-
 tests/compatibility-tests/pom.xml | 33 ++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index a35620839a..a7bfd718d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
       <version.batavia>1.0.10.Final</version.batavia>
 
       <!-- used on tests -->
-      <groovy.version>2.5.10</groovy.version>
+      <groovy.version>4.0.0</groovy.version>
       <vertx.version>3.9.4</vertx.version>
       <hadoop.minikdc.version>3.3.1</hadoop.minikdc.version>
 
diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index 1b13b0ac96..29ab73c592 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -163,17 +163,22 @@
          <version>2.21.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>org.codehaus.groovy</groupId>
+         <groupId>org.apache.groovy</groupId>
          <artifactId>groovy-all</artifactId>
          <version>${groovy.version}</version>
          <type>pom</type>
          <exclusions>
             <exclusion>
-               <groupId>org.codehaus.groovy</groupId>
+               <groupId>org.apache.groovy</groupId>
                <artifactId>groovy-test-junit5</artifactId>
             </exclusion>
          </exclusions>
       </dependency>
+      <dependency>
+         <groupId>org.apache.groovy</groupId>
+         <artifactId>groovy-testng</artifactId>
+         <version>${groovy.version}</version>
+      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-junit</artifactId>
@@ -342,7 +347,7 @@
                         <arg>org.apache.activemq:artemis-hornetq-protocol:${project.version}</arg>
                         <arg>org.apache.activemq:artemis-amqp-protocol:${project.version}</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:${project.version}</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -364,7 +369,7 @@
                         <arg>org.apache.activemq:artemis-server:${project.version}</arg>
                         <arg>org.apache.activemq:artemis-journal:${project.version}</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:${project.version}</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>jakarta.jms:jakarta.jms-api:3.0.0</arg>
@@ -392,7 +397,7 @@
                         <arg>org.apache.activemq:artemis-hornetq-protocol:2.6.3</arg>
                         <arg>org.apache.activemq:artemis-amqp-protocol:2.6.3</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:2.6.3</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -416,7 +421,7 @@
                         <arg>org.apache.activemq:artemis-hornetq-protocol:2.7.0</arg>
                         <arg>org.apache.activemq:artemis-amqp-protocol:2.7.0</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:2.7.0</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -441,7 +446,7 @@
                         <arg>org.apache.activemq:artemis-hornetq-protocol:2.10.0</arg>
                         <arg>org.apache.activemq:artemis-amqp-protocol:2.10.0</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:2.10.0</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                         <arg>org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final</arg>
                      </libListWithDeps>
                      <libList>
@@ -467,7 +472,7 @@
                         <arg>org.apache.activemq:artemis-amqp-protocol:2.4.0</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:2.4.0</arg>
                         <arg>org.apache.qpid:qpid-jms-client:0.26.0</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -492,7 +497,7 @@
                         <arg>org.apache.activemq:artemis-amqp-protocol:2.1.0</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:2.1.0</arg>
                         <arg>org.apache.qpid:qpid-jms-client:0.22.0</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -517,7 +522,7 @@
                         <arg>org.apache.activemq:artemis-amqp-protocol:2.0.0</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:2.0.0</arg>
                         <arg>org.apache.qpid:qpid-jms-client:0.20.0</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -541,7 +546,7 @@
                         <arg>org.apache.activemq:artemis-hornetq-protocol:1.4.0</arg>
                         <arg>org.apache.activemq:artemis-amqp-protocol:1.4.0</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:1.4.0</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -565,7 +570,7 @@
                         <arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
                         <arg>org.apache.activemq:artemis-amqp-protocol:1.5.5</arg>
                         <arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                         <arg>org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final</arg>
                      </libListWithDeps>
                      <libList>
@@ -591,7 +596,7 @@
                      </extraRepositories>
                      <libListWithDeps>
                         <arg>org.hornetq:hornetq-jms-server:2.3.5.Final</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
@@ -616,7 +621,7 @@
                      </extraRepositories>
                      <libListWithDeps>
                         <arg>org.hornetq:hornetq-jms-server:2.4.7.Final</arg>
-                        <arg>org.codehaus.groovy:groovy-all:pom:${groovy.version}</arg>
+                        <arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
                      </libListWithDeps>
                      <libList>
                         <arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>