chore(deps): update to groovy 4.0.22 (#4458)

related to: #3679
camunda · Aug 13, 2024 · d5c3a72 · d5c3a72
1 parent 8fe087b
commit d5c3a72
Show file tree

Hide file tree

Showing 38 changed files with 194 additions and 99 deletions.
diff --git a/distro/run/assembly/assembly.xml b/distro/run/assembly/assembly.xml
@@ -37,11 +37,13 @@
       <outputDirectory>configuration/userlib/</outputDirectory>
       <includes>
         <include>com.h2database:h2</include>
-        <include>org.codehaus.groovy:groovy:jar:*</include>
-        <include>org.codehaus.groovy:groovy-jsr223:jar:*</include>
-        <include>org.codehaus.groovy:groovy-json:jar:*</include>
-        <include>org.codehaus.groovy:groovy-xml:jar:*</include>
-        <include>org.codehaus.groovy:groovy-templates:jar:*</include>
+        <include>org.apache.groovy:groovy:jar:*</include>
+        <include>org.apache.groovy:groovy-jsr223:jar:*</include>
+        <include>org.apache.groovy:groovy-json:jar:*</include>
+        <include>org.apache.groovy:groovy-xml:jar:*</include>
+        <include>org.apache.groovy:groovy-templates:jar:*</include>
+        <include>org.apache.groovy:groovy-dateutil:jar:*</include>
+        <include>org.apache.groovy:groovy-datetime:jar:*</include>
       </includes>
     </dependencySet>
   </dependencySets>

diff --git a/distro/run/assembly/pom.xml b/distro/run/assembly/pom.xml
@@ -24,7 +24,7 @@
     <dependencies>
       <!-- override the Spring Boot Groovy version with the Camunda Groovy version -->
       <dependency>
-        <groupId>org.codehaus.groovy</groupId>
+        <groupId>org.apache.groovy</groupId>
         <artifactId>groovy-bom</artifactId>
         <version>${version.groovy}</version>
         <scope>import</scope>
@@ -89,21 +89,29 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-jsr223</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-xml</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-dateutil</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-datetime</artifactId>
+    </dependency>
 
   </dependencies>
 

diff --git a/distro/tomcat/assembly/assembly.xml b/distro/tomcat/assembly/assembly.xml
@@ -42,11 +42,14 @@
         <include>org.mybatis:mybatis:jar:*</include>
         <include>com.fasterxml.uuid:java-uuid-generator:jar:*</include>
         <include>joda-time:joda-time:jar:*</include>
-        <include>org.codehaus.groovy:groovy:jar:*</include>
-        <include>org.codehaus.groovy:groovy-jsr223:jar:*</include>
-        <include>org.codehaus.groovy:groovy-json:jar:*</include>
-        <include>org.codehaus.groovy:groovy-xml:jar:*</include>
-        <include>org.codehaus.groovy:groovy-templates:jar:*</include>
+        <include>org.apache.groovy:groovy:jar:*</include>
+        <include>org.apache.groovy:groovy-jsr223:jar:*</include>
+        <include>org.apache.groovy:groovy-json:jar:*</include>
+        <include>org.apache.groovy:groovy-xml:jar:*</include>
+        <include>org.apache.groovy:groovy-templates:jar:*</include>
+        <include>org.apache.groovy:groovy-dateutil:jar:*</include>
+        <include>org.apache.groovy:groovy-datetime:jar:*</include>
+
         <include>org.graalvm.js:*</include>
         <include>org.graalvm.regex:regex:jar:*</include>
         <include>org.graalvm.truffle:truffle-api:jar:*</include>
@@ -84,11 +87,13 @@
         <include>org.mybatis:mybatis:jar:*</include>
         <include>com.fasterxml.uuid:java-uuid-generator:jar:*</include>
         <include>joda-time:joda-time:jar:*</include>
-        <include>org.codehaus.groovy:groovy:jar:*</include>
-        <include>org.codehaus.groovy:groovy-jsr223:jar:*</include>
-        <include>org.codehaus.groovy:groovy-json:jar:*</include>
-        <include>org.codehaus.groovy:groovy-xml:jar:*</include>
-        <include>org.codehaus.groovy:groovy-templates:jar:*</include>
+        <include>org.apache.groovy:groovy:jar:*</include>
+        <include>org.apache.groovy:groovy-jsr223:jar:*</include>
+        <include>org.apache.groovy:groovy-json:jar:*</include>
+        <include>org.apache.groovy:groovy-xml:jar:*</include>
+        <include>org.apache.groovy:groovy-templates:jar:*</include>
+        <include>org.apache.groovy:groovy-dateutil:jar:*</include>
+        <include>org.apache.groovy:groovy-datetime:jar:*</include>
         <include>org.graalvm.js:*</include>
         <include>org.graalvm.regex:regex:jar:*</include>
         <include>org.graalvm.truffle:truffle-api:jar:*</include>

diff --git a/distro/tomcat/assembly/pom.xml b/distro/tomcat/assembly/pom.xml
@@ -45,25 +45,33 @@
     </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-jsr223</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-xml</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-dateutil</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-datetime</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.graalvm.js</groupId>

diff --git a/distro/wildfly/assembly/assembly.xml b/distro/wildfly/assembly/assembly.xml
@@ -46,11 +46,13 @@
         <include>org.mybatis:mybatis:jar:*</include>
         <include>com.fasterxml.uuid:java-uuid-generator:jar:*</include>
         <include>joda-time:joda-time:jar:*</include>
-        <include>org.codehaus.groovy:groovy:jar:*</include>
-        <include>org.codehaus.groovy:groovy-jsr223:jar:*</include>
-        <include>org.codehaus.groovy:groovy-json:jar:*</include>
-        <include>org.codehaus.groovy:groovy-xml:jar:*</include>
-        <include>org.codehaus.groovy:groovy-templates:jar:*</include>
+        <include>org.apache.groovy:groovy:jar:*</include>
+        <include>org.apache.groovy:groovy-jsr223:jar:*</include>
+        <include>org.apache.groovy:groovy-json:jar:*</include>
+        <include>org.apache.groovy:groovy-xml:jar:*</include>
+        <include>org.apache.groovy:groovy-templates:jar:*</include>
+        <include>org.apache.groovy:groovy-dateutil:jar:*</include>
+        <include>org.apache.groovy:groovy-datetime:jar:*</include>
         <include>org.graalvm.js:*</include>
         <include>org.graalvm.regex:regex:jar:*</include>
         <include>org.graalvm.truffle:truffle-api:jar:*</include>

diff --git a/distro/wildfly/assembly/pom.xml b/distro/wildfly/assembly/pom.xml
@@ -77,25 +77,33 @@
     </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-jsr223</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-xml</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-dateutil</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-datetime</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.graalvm.js</groupId>

diff --git a/distro/wildfly/modules/pom.xml b/distro/wildfly/modules/pom.xml
@@ -83,25 +83,33 @@
 
     <!-- script engine dependencies -->
     <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-jsr223</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-xml</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-dateutil</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-datetime</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.graalvm.js</groupId>
@@ -243,13 +251,13 @@
                 </copy>
 
                 <!-- copy groovy dependencies to single dir -->
-                <delete dir="target/modules/org/codehaus/groovy" />
+                <delete dir="target/modules/org/apache/groovy" />
                 <copy todir="target/modules" flatten="false">
                   <fileset refid="maven.project.dependencies" />
                   <mapper>
                     <chainedmapper>
                       <regexpmapper from="^(.*)/([^/]+)/([^/]+)/([^/]*)$$" to="\1/groovy-all/main/\4" handledirsep="yes" />
-                      <regexpmapper from="^(org.codehaus.groovy.*/.*.jar)$$" to="\1" handledirsep="yes" />
+                      <regexpmapper from="^(org.apache.groovy.*/.*.jar)$$" to="\1" handledirsep="yes" />
                     </chainedmapper>
                   </mapper>
                 </copy>

diff --git a/...odehaus/groovy/groovy-all/main/module.xml → .../apache/groovy/groovy-all/main/module.xml b/...odehaus/groovy/groovy-all/main/module.xml → .../apache/groovy/groovy-all/main/module.xml
@@ -1,10 +1,12 @@
-<module xmlns="urn:jboss:module:1.0" name="org.codehaus.groovy.groovy-all">
+<module xmlns="urn:jboss:module:1.0" name="org.apache.groovy.groovy-all">
   <resources>
     <resource-root path="[email protected]@.jar" />
     <resource-root path="[email protected]@.jar" />
     <resource-root path="[email protected]@.jar" />
     <resource-root path="[email protected]@.jar" />
-    <resource-root path="[email protected]@.jar" />
+    <resource-root path="[email protected]@.jar" /> 
+    <resource-root path="[email protected]@.jar" /> 
+    <resource-root path="[email protected]@.jar" /> 
   </resources>
 
   <dependencies>

diff --git a/distro/wildfly/modules/src/main/modules/org/camunda/bpm/camunda-engine/main/module.xml b/distro/wildfly/modules/src/main/modules/org/camunda/bpm/camunda-engine/main/module.xml
@@ -24,7 +24,7 @@
     <module name="com.fasterxml.uuid.java-uuid-generator"/>
     <module name="org.joda.time" slot="2.1" />
 
-    <module name="org.codehaus.groovy.groovy-all" services="import"/>
+    <module name="org.apache.groovy.groovy-all" services="import"/>
     <module name="org.graalvm.js.js-scriptengine" services="import"/>
     <module name="org.graalvm.js.js" services="import"/>
     <module name="org.graalvm.regex.regex" services="import"/>

diff --git a/distro/wildfly26/modules/pom.xml b/distro/wildfly26/modules/pom.xml
@@ -83,25 +83,33 @@
 
     <!-- script engine dependencies -->
     <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-jsr223</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-xml</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-dateutil</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-datetime</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.graalvm.js</groupId>
@@ -259,13 +267,13 @@
                 </copy>
 
                 <!-- copy groovy dependencies to single dir -->
-                <delete dir="target/modules/org/codehaus/groovy" />
+                <delete dir="target/modules/org/apache/groovy" />
                 <copy todir="target/modules" flatten="false">
                   <fileset refid="maven.project.dependencies" />
                   <mapper>
                     <chainedmapper>
                       <regexpmapper from="^(.*)/([^/]+)/([^/]+)/([^/]*)$$" to="\1/groovy-all/main/\4" handledirsep="yes" />
-                      <regexpmapper from="^(org.codehaus.groovy.*/.*.jar)$$" to="\1" handledirsep="yes" />
+                      <regexpmapper from="^(org.apache.groovy.*/.*.jar)$$" to="\1" handledirsep="yes" />
                     </chainedmapper>
                   </mapper>
                 </copy>

diff --git a/...odehaus/groovy/groovy-all/main/module.xml → .../apache/groovy/groovy-all/main/module.xml b/...odehaus/groovy/groovy-all/main/module.xml → .../apache/groovy/groovy-all/main/module.xml
@@ -1,10 +1,12 @@
-<module xmlns="urn:jboss:module:1.0" name="org.codehaus.groovy.groovy-all">
+<module xmlns="urn:jboss:module:1.0" name="org.apache.groovy.groovy-all">
   <resources>
     <resource-root path="[email protected]@.jar" />
     <resource-root path="[email protected]@.jar" />
     <resource-root path="[email protected]@.jar" />
     <resource-root path="[email protected]@.jar" />
     <resource-root path="[email protected]@.jar" />
+    <resource-root path="[email protected]@.jar" /> 
+    <resource-root path="[email protected]@.jar" /> 
   </resources>
 
   <dependencies>

diff --git a/distro/wildfly26/modules/src/main/modules/org/camunda/bpm/camunda-engine/main/module.xml b/distro/wildfly26/modules/src/main/modules/org/camunda/bpm/camunda-engine/main/module.xml
@@ -18,7 +18,7 @@
     <module name="org.mybatis.mybatis" />
     <module name="com.fasterxml.uuid.java-uuid-generator"/>
     <module name="org.joda.time" slot="2.1" />
-    <module name="org.codehaus.groovy.groovy-all" services="import"/>
+    <module name="org.apache.groovy.groovy-all" services="import"/>
     <module name="org.graalvm.js.js-scriptengine" services="import"/>
 
     <module name="sun.jdk" services="import"/>

diff --git a/engine-dmn/engine/pom.xml b/engine-dmn/engine/pom.xml
@@ -85,7 +85,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-jsr223</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/engine-plugins/connect-plugin/pom.xml b/engine-plugins/connect-plugin/pom.xml
@@ -58,7 +58,7 @@
    </dependency>
 
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-jsr223</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/engine-plugins/spin-plugin/pom.xml b/engine-plugins/spin-plugin/pom.xml
@@ -72,7 +72,7 @@
    </dependency>
 
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-jsr223</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/engine-spring/core-6/pom.xml b/engine-spring/core-6/pom.xml
@@ -96,7 +96,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-jsr223</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/engine-spring/core/pom.xml b/engine-spring/core/pom.xml
@@ -88,7 +88,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy-jsr223</artifactId>
       <scope>test</scope>
     </dependency>