From 212046e8932963d1f86f1b4f2b34ae6b2c853685 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sat, 7 Aug 2021 15:24:33 +1000
Subject: [PATCH 1/2] [MINVOKER-274] upgrade to groovy 3.0.8

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 pom.xml | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 87 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f062934..34fe80d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,8 +73,8 @@ under the License.
     <beanshell-artifactId>bsh</beanshell-artifactId>
     <beanshell-version>2.0b6</beanshell-version>
     <groovy-groupId>org.codehaus.groovy</groovy-groupId>
-    <groovy-artifactId>groovy-all</groovy-artifactId>
-    <groovy-version>2.4.21</groovy-version>
+    <groovy-artifactId>groovy</groovy-artifactId>
+    <groovy-version>3.0.8</groovy-version>
     <surefire.version>2.22.2</surefire.version>
     <project.build.outputTimestamp>2021-02-14T00:04:14Z</project.build.outputTimestamp>
   </properties>
@@ -205,6 +205,91 @@ under the License.
       <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
+    <!-- groovy-all do not provide anymore a uber jar containing everything so we must add some dependencies -->
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-ant</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-astbuilder</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-console</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-datetime</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-jmx</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-json</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-jsr223</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-macro</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-nio</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-servlet</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-test</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-test-junit5</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-testng</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${groovy-groupId}</groupId>
+      <artifactId>groovy-xml</artifactId>
+      <version>${groovy-version}</version>
+      <scope>runtime</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

From ae1f1147843a97d576b7ef0ca09ddafdcbef18cf Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sun, 8 Aug 2021 13:30:59 +1000
Subject: [PATCH 2/2] use bom

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 pom.xml | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34fe80d7..d859437f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,18 @@ under the License.
     <project.build.outputTimestamp>2021-02-14T00:04:14Z</project.build.outputTimestamp>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${groovy-groupId}</groupId>
+        <artifactId>groovy-bom</artifactId>
+        <version>${groovy-version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -202,92 +214,77 @@ under the License.
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>${groovy-artifactId}</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <!-- groovy-all do not provide anymore a uber jar containing everything so we must add some dependencies -->
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-ant</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-astbuilder</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-console</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-datetime</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-jmx</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-json</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-jsr223</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-macro</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-nio</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-servlet</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-test</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-test-junit5</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-testng</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>${groovy-groupId}</groupId>
       <artifactId>groovy-xml</artifactId>
-      <version>${groovy-version}</version>
       <scope>runtime</scope>
     </dependency>