WIP gradle 9.0 update

Author: breskeby

build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/AntTask.groovy

@@ -9,18 +9,18 @@
 
 package org.elasticsearch.gradle.internal
 
+import groovy.ant.AntBuilder
+
 import org.apache.tools.ant.BuildListener
 import org.apache.tools.ant.BuildLogger
 import org.apache.tools.ant.DefaultLogger
 import org.apache.tools.ant.Project
 import org.gradle.api.DefaultTask
-import org.gradle.api.GradleException
 import org.gradle.api.file.FileSystemOperations
-import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
 
-import javax.inject.Inject
 import java.nio.charset.Charset
+import javax.inject.Inject
 
 /**
  * A task which will run ant commands.
@@ -83,7 +83,8 @@ public abstract class AntTask extends DefaultTask {
         return new DefaultLogger(
             errorPrintStream: stream,
             outputPrintStream: stream,
-            messageOutputLevel: outputLevel)
+            messageOutputLevel: outputLevel
+        )
     }
 
     /**

build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/test/AntFixture.groovy

@@ -9,6 +9,8 @@
 
 package org.elasticsearch.gradle.internal.test
 
+import groovy.ant.AntBuilder
+
 import org.elasticsearch.gradle.OS
 
 import org.elasticsearch.gradle.internal.AntFixtureStop

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

@@ -41,7 +41,7 @@
  *
  * This task is necessary because the built-in task {@link org.gradle.api.tasks.bundling.Tar} does not preserve symbolic links.
  */
-public class SymbolicLinkPreservingTar extends Tar {
+public abstract class SymbolicLinkPreservingTar extends Tar {
 
     @Override
     protected CopyAction createCopyAction() {

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

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

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/main/java/org/elasticsearch/gradle/internal/release/ExtractCurrentVersionsTask.java

@@ -29,7 +29,7 @@
 
 import javax.inject.Inject;
 
-public class ExtractCurrentVersionsTask extends AbstractVersionsTask {
+public abstract class ExtractCurrentVersionsTask extends AbstractVersionsTask {
     private static final Logger LOGGER = Logging.getLogger(ExtractCurrentVersionsTask.class);
 
     private Path outputFile;

build.gradle

@@ -21,6 +21,8 @@ import org.elasticsearch.gradle.internal.ResolveAllDependencies
 import org.elasticsearch.gradle.util.GradleUtils
 import org.gradle.plugins.ide.eclipse.model.AccessRule
 
+import groovy.xml.XmlParser;
+import groovy.xml.XmlNodePrinter;
 import java.nio.file.Files
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING

gradle/verification-metadata.xml

@@ -929,6 +929,11 @@
             <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"/>
@@ -3254,6 +3259,11 @@
             <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"/>