Update Gradle compatibility

Author: breskeby

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/idea/IdeaXmlUtil.java

@@ -10,8 +10,8 @@
 package org.elasticsearch.gradle.internal.idea;
 
 import groovy.util.Node;
-import groovy.xml.XmlParser;
 import groovy.xml.XmlNodePrinter;
+import groovy.xml.XmlParser;
 
 import org.gradle.api.Action;
 import org.xml.sax.SAXException;

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/AbstractVersionsTask.java

@@ -51,9 +51,9 @@
 
 public abstract class AbstractVersionsTask extends DefaultTask {
 
-//    static {
-//        replaceDefaultJavaParserClassCsm();
-//    }
+    static {
+        replaceDefaultJavaParserClassCsm();
+    }
 
     /*
      * The default JavaParser CSM which it uses to format any new declarations added to a class

build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/UpdateVersionsTaskTests.java

@@ -189,7 +189,7 @@ public void updateVersionFile_addsCorrectly() throws Exception {
 
         // write out & parse back in again
         StringWriter writer = new StringWriter();
-        LexicalPreservingPrinter.print(unit, writer);
+        writer.append(LexicalPreservingPrinter.print(unit));
         unit = StaticJavaParser.parse(writer.toString());
 
         // a field has been added
@@ -229,7 +229,7 @@ public void updateVersionFile_removesCorrectly() throws Exception {
 
         // write out & parse back in again
         StringWriter writer = new StringWriter();
-        LexicalPreservingPrinter.print(unit, writer);
+        writer.append(LexicalPreservingPrinter.print(unit));
         unit = StaticJavaParser.parse(writer.toString());
 
         // a field has been removed

gradle/build.versions.toml

@@ -2,7 +2,7 @@
 asm = "9.7.1"
 jackson = "2.15.0"
 junit5 = "5.12.1"
-spock = "2.1-groovy-3.0"
+spock = "2.3-groovy-4.0"
 nmcp = "0.1.5"
 
 [libraries]

gradle/verification-metadata.xml

@@ -929,11 +929,6 @@
             <sha256 value="5d421a5c6f0b436f46f3a73a1672ab28058489f3816ecd980aa17e9670a04f87" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="9.0.1">
-         <artifact name="shadow-gradle-plugin-9.0.1.jar">
-            <sha256 value="5d421a5c6f0b436f46f3a73a1672ab28058489f3816ecd980aa17e9670a04f87" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.h2database" name="h2" version="1.4.197">
          <artifact name="h2-1.4.197.jar">
             <sha256 value="37f5216e14af2772930dff9b8734353f0a80e89ba3f33e065441de6537c5e842" origin="Generated by Gradle"/>
@@ -2551,6 +2546,11 @@
             <sha256 value="0070a12e58f491b95719391325299a6294530ee6c3ce25e50bdc98b0b700966c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.groovy" name="groovy" version="4.0.4">
+         <artifact name="groovy-4.0.4.jar">
+            <sha256 value="1429a3d4cd6f5d7858e4941e553e0bb4b7bc451c003050b9694213eda0614d04" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.hadoop" name="hadoop-annotations" version="2.8.5">
          <artifact name="hadoop-annotations-2.8.5.jar">
             <sha256 value="6df69a714d6ed71842004733724add3a5e7d1078f1e0a66631b4f6b56118875b" origin="Generated by Gradle"/>
@@ -3259,11 +3259,6 @@
             <sha256 value="5d3490f72ad3a7e82be88b27629f37c59fd2531bae511c3b13866420d5d862bd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.maven" name="maven-api-annotations" version="4.0.0-rc-3">
-         <artifact name="maven-api-annotations-4.0.0-rc-3.jar">
-            <sha256 value="5d3490f72ad3a7e82be88b27629f37c59fd2531bae511c3b13866420d5d862bd" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.apache.maven" name="maven-api-meta" version="4.0.0-alpha-9">
          <artifact name="maven-api-meta-4.0.0-alpha-9.jar">
             <sha256 value="32c4f5cadbab680c34952f9cb570457a1383ccec4c9a57b0392607d7191c6949" origin="Generated by Gradle"/>
@@ -4337,6 +4332,11 @@
             <sha256 value="fa4fa68c8bd54dd0cb49c3fcbe9b2e42f4da6bedbe7e7ccf2a05f1a1e609b593" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.9.0">
+         <artifact name="junit-platform-commons-1.9.0.jar">
+            <sha256 value="e5894b710094b4caafc6280b8829a439fb764901ea0ae18d06ed80388b309b7a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-engine" version="1.12.1">
          <artifact name="junit-platform-engine-1.12.1.jar">
             <sha256 value="7fedff93fd92aec7d29fc60dc01fa027246b36b8088423a5efc4949e5f6affa4" origin="Generated by Gradle"/>
@@ -4347,6 +4347,11 @@
             <sha256 value="702868ed7e86b9b4672ede0f1e185e905baca9afab57746a7c650be3c7bca047" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.9.0">
+         <artifact name="junit-platform-engine-1.9.0.jar">
+            <sha256 value="aaec735f7444a9fc055e206598de3d829c24e9c7a8eea6efdeeb1962087fe811" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-launcher" version="1.12.1">
          <artifact name="junit-platform-launcher-1.12.1.jar">
             <sha256 value="ebbb14e7b29f60730eaede862ed69d7de0d581ea0c038fa6a202955c7541f525" origin="Generated by Gradle"/>
@@ -4937,11 +4942,21 @@
             <sha256 value="fa8ff7446df04c51b3ccbc2a1bbc71f9c280878afe2d53be44d59d00b1b9828c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.spockframework" name="spock-core" version="2.3-groovy-4.0">
+         <artifact name="spock-core-2.3-groovy-4.0.jar">
+            <sha256 value="60a614a7640c4fc9dfd432929a426bd0448f299915924556ae372105a118ff14" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.spockframework" name="spock-junit4" version="2.1-groovy-3.0">
          <artifact name="spock-junit4-2.1-groovy-3.0.jar">
             <sha256 value="6e6d05ead831c37e6fc93415cdaea60656674266a5574c98a0e1f7a82b990ca2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.spockframework" name="spock-junit4" version="2.3-groovy-4.0">
+         <artifact name="spock-junit4-2.3-groovy-4.0.jar">
+            <sha256 value="fea4b91afb5eb68a80007c9d88c8c189b5cd791d39d601d75c92e6f6bb587735" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.subethamail" name="subethasmtp" version="3.1.7">
          <artifact name="subethasmtp-3.1.7.jar">
             <sha256 value="5196a0da2c5a33d1a04e88fc7a9cc109501bc265b5bac8edd9984a1885070ad4" origin="Generated by Gradle"/>