XCOMMONS-2404: Upgrade to Groovy 4.0.17

pom.xml

@@ -1448,6 +1448,54 @@
                 <id>com.google.javascript:closure-compiler-unshaded</id>
                 <features>com.google.javascript:closure-compiler</features>
               </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy</id>
+                <features>org.codehaus.groovy:groovy</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-datetime</id>
+                <features>org.codehaus.groovy:groovy-datetime</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-jmx</id>
+                <features>org.codehaus.groovy:groovy-jmx</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-json</id>
+                <features>org.codehaus.groovy:groovy-json</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-jsr223</id>
+                <features>org.codehaus.groovy:groovy-jsr223</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-macro</id>
+                <features>org.codehaus.groovy:groovy-macro</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-nio</id>
+                <features>org.codehaus.groovy:groovy-nio</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-servlet</id>
+                <features>org.codehaus.groovy:groovy-servlet</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-sql</id>
+                <features>org.codehaus.groovy:groovy-sql</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-templates</id>
+                <features>org.codehaus.groovy:groovy-templates</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-xml</id>
+                <features>org.codehaus.groovy:groovy-xml</features>
+              </extensionOverride>
+              <extensionOverride>
+                <id>org.apache.groovy:groovy-dateutil</id>
+                <features>org.codehaus.groovy:groovy-dateutil</features>
+              </extensionOverride>
             </extensionOverrides>
           </configuration>
         </plugin>

xwiki-platform-core/pom.xml

@@ -353,12 +353,12 @@
                      If you are using Groovy >= 2.3.0-rc-1, remember to include groovy-ant as a 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-ant</artifactId>
                 <version>${groovy.version}</version>
               </dependency>

xwiki-platform-core/xwiki-platform-oldcore/pom.xml

@@ -145,7 +145,7 @@
     <!-- Note: We only depend on the miniumum required to compile oldcore since the distributions will depend on
          xwiki-commons-groovy which has dependencies on all the various groovy jars and thus they'll be bundled -->
     <dependency>
-      <groupId>org.codehaus.groovy</groupId>
+      <groupId>org.apache.groovy</groupId>
       <artifactId>groovy</artifactId>
     </dependency>