From b0571165e752922d8c9c5cf3b5722c6212cb5f6e Mon Sep 17 00:00:00 2001
From: Jason Dillon <jdillon@users.noreply.github.com>
Date: Fri, 11 Nov 2022 12:20:59 -0800
Subject: [PATCH] * Update to latest parent 36 * Update to latest Apache Groovy
 4.0.6 * Update to latest Groovy Eclipse-Compiler 3.8.0 and Batch 4.0.6-02
 (neither presently available in Maven Central; must include
 https://groovy.jfrog.io/artifactory/plugins-release) * Update to latest
 maven-compile-plugin 3.10.1

---
 bom/pom.xml      | 40 +++++++++-------------------------------
 common/pom.xml   |  2 +-
 pom.xml          | 18 ++++++++++++++----
 support/pom.xml  |  2 +-
 testbase/pom.xml |  4 ++--
 5 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 1fdf394..841c593 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <groovy.version>3.0.8</groovy.version>
+    <groovy.version>4.0.6</groovy.version>
     <slf4j.version>1.7.36</slf4j.version>
     <logback.version>1.2.11</logback.version>
     <guava.version>31.1-jre</guava.version>
@@ -41,6 +41,14 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.apache.groovy</groupId>
+        <artifactId>groovy-bom</artifactId>
+        <version>${groovy.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
@@ -77,36 +85,6 @@
         <version>${guava.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-json</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-xml</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-yaml</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-ant</artifactId>
-        <version>${groovy.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>info.picocli</groupId>
         <artifactId>picocli</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index bd08cd0..b666646 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -62,7 +62,7 @@
 <!--    </dependency>-->
 
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-ant</artifactId>
       <optional>true</optional>
     </dependency>
diff --git a/pom.xml b/pom.xml
index da3baf9..311a996 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.sonatype.buildsupport</groupId>
     <artifactId>public-parent</artifactId>
-    <version>33</version>
+    <version>36</version>
     <relativePath/>
   </parent>
 
@@ -115,23 +115,33 @@
         </executions>
       </plugin>
 
+      <!--
+      FIXME: unfortunately; the latest builds of the compiler and batch adapter are not published to Maven Central
+
+      FIXME: they are only in:
+      FIXME:    https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-compiler
+      FIXME:    https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-batch
+
+      FIXME: asked why here: https://github.com/groovy/groovy-eclipse/issues/1416
+      -->
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.10.1</version>
         <dependencies>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>3.7.0</version>
+            <version>3.8.0</version>
           </dependency>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>3.0.8-01</version>
+            <version>4.0.6-02</version>
           </dependency>
         </dependencies>
         <configuration>
-          <!-- see: https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-Maven-plugin -->
           <compilerId>groovy-eclipse-compiler</compilerId>
         </configuration>
       </plugin>
diff --git a/support/pom.xml b/support/pom.xml
index b345499..bd738e7 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -46,7 +46,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy</artifactId>
       <optional>true</optional>
     </dependency>
diff --git a/testbase/pom.xml b/testbase/pom.xml
index 19c8802..3671f66 100644
--- a/testbase/pom.xml
+++ b/testbase/pom.xml
@@ -66,12 +66,12 @@
     </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-ant</artifactId>
     </dependency>
   </dependencies>