Update Gradle wrapper to 8.0.2 (#2070)

* Use gradle 8.0.2
* Fix deprecation warnings with Gradle 8x and incompatibilties
* Add more heap to address additional memory demands of gradle 8x
* Fixing the build

---------

Co-authored-by: Keith Massey <keith.massey@elastic.co>

Author: breskeby

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy

@@ -507,17 +507,17 @@ class BuildPlugin implements Plugin<Project>  {
         pack.dependsOn(project.tasks.jar)
         pack.dependsOn(project.tasks.javadocJar)
         pack.dependsOn(project.tasks.sourcesJar)
-        pack.outputs.files(project.tasks.jar.archivePath, project.tasks.javadocJar.archivePath, project.tasks.sourcesJar.archivePath)
+        pack.outputs.files(project.tasks.jar.getArchiveFile(), project.tasks.javadocJar.getArchiveFile(), project.tasks.sourcesJar.getArchiveFile().get().getAsFile())
         project.getPlugins().withType(SparkVariantPlugin).whenPluginAdded {
             SparkVariantPluginExtension sparkVariants = project.getExtensions().getByType(SparkVariantPluginExtension.class)
             sparkVariants.featureVariants { SparkVariant variant ->
                 pack.dependsOn(project.tasks.getByName(variant.taskName('jar')))
                 pack.dependsOn(project.tasks.getByName(variant.taskName('javadocJar')))
                 pack.dependsOn(project.tasks.getByName(variant.taskName('sourcesJar')))
                 pack.outputs.files(
-                        project.tasks.getByName(variant.taskName('jar')).archivePath,
-                        project.tasks.getByName(variant.taskName('javadocJar')).archivePath,
-                        project.tasks.getByName(variant.taskName('sourcesJar')).archivePath
+                        project.tasks.getByName(variant.taskName('jar')).getArchiveFile().get().getAsFile(),
+                        project.tasks.getByName(variant.taskName('javadocJar')).getArchiveFile().get().getAsFile(),
+                        project.tasks.getByName(variant.taskName('sourcesJar')).getArchiveFile().get().getAsFile()
                 )
             }
         }

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/InstanceInfo.groovy

@@ -118,7 +118,7 @@ class InstanceInfo {
      * as well as a groovy AntBuilder, to enable running ant condition checks. The default wait
      * condition is for http on the http port.
      */
-    Closure waitCondition = { InstanceInfo instanceInfo, AntBuilder ant ->
+    Closure waitCondition = { InstanceInfo instanceInfo, groovy.ant.AntBuilder ant ->
         String waitUrl = instanceInfo.httpUri()
         if (waitUrl == null) {
             return true

buildSrc/src/main/java/org/elasticsearch/hadoop/gradle/buildtools/info/GlobalBuildInfoPlugin.java

@@ -104,7 +104,7 @@ public void apply(Project project) {
             params.setRuntimeJavaHome(runtimeJavaHome);
             params.setRuntimeJavaVersion(determineJavaVersion("runtime java.home", runtimeJavaHome, minimumRuntimeVersion));
             params.setIsRuntimeJavaHomeSet(Jvm.current().getJavaHome().equals(runtimeJavaHome) == false);
-            JvmInstallationMetadata runtimeJdkMetaData = metadataDetector.getMetadata(getJavaInstallation(runtimeJavaHome).getLocation());
+            JvmInstallationMetadata runtimeJdkMetaData = metadataDetector.getMetadata(getJavaInstallation(runtimeJavaHome));
             params.setJavaVersions(getAvailableJavaVersions());
             params.setMinimumCompilerVersion(minimumCompilerVersion);
             params.setMinimumRuntimeVersion(minimumRuntimeVersion);
@@ -127,16 +127,15 @@ private void logGlobalBuildInfo() {
         final String osVersion = System.getProperty("os.version");
         final String osArch = System.getProperty("os.arch");
         final Jvm gradleJvm = Jvm.current();
-        JvmInstallationMetadata gradleJvmMetadata = metadataDetector.getMetadata(gradleJvm.getJavaHome());
+        JvmInstallationMetadata gradleJvmMetadata = metadataDetector.getMetadata(getJavaInstallation(gradleJvm.getJavaHome()));
         final String gradleJvmVendorDetails = gradleJvmMetadata.getVendor().getDisplayName();
         LOGGER.quiet("=======================================");
         LOGGER.quiet("Elasticsearch Build Hamster says Hello!");
         LOGGER.quiet("  Gradle Version        : " + GradleVersion.current().getVersion());
         LOGGER.quiet("  OS Info               : " + osName + " " + osVersion + " (" + osArch + ")");
         if (BuildParams.getIsRuntimeJavaHomeSet()) {
-            final String runtimeJvmVendorDetails = metadataDetector.getMetadata(BuildParams.getRuntimeJavaHome())
-                .getVendor()
-                .getDisplayName();
+            JvmInstallationMetadata runtimeJvm = metadataDetector.getMetadata(getJavaInstallation(BuildParams.getRuntimeJavaHome()));
+            final String runtimeJvmVendorDetails = runtimeJvm.getVendor().getDisplayName();
             LOGGER.quiet("  Runtime JDK Version   : " + BuildParams.getRuntimeJavaVersion() + " (" + runtimeJvmVendorDetails + ")");
             LOGGER.quiet("  Runtime java.home     : " + BuildParams.getRuntimeJavaHome());
             LOGGER.quiet("  Gradle JDK Version    : " + gradleJvm.getJavaVersion() + " (" + gradleJvmVendorDetails + ")");
@@ -152,7 +151,7 @@ private void logGlobalBuildInfo() {
 
     private JavaVersion determineJavaVersion(String description, File javaHome, JavaVersion requiredVersion) {
         InstallationLocation installation = getJavaInstallation(javaHome);
-        JavaVersion actualVersion = metadataDetector.getMetadata(installation.getLocation()).getLanguageVersion();
+        JavaVersion actualVersion = metadataDetector.getMetadata(installation).getLanguageVersion();
         if (actualVersion.isCompatibleWith(requiredVersion) == false) {
             throwInvalidJavaHomeException(
                 description,
@@ -186,7 +185,7 @@ private boolean isSameFile(File javaHome, InstallationLocation installationLocat
     private List<JavaHome> getAvailableJavaVersions() {
         return getAvailableJavaInstallationLocationSteam().map(installationLocation -> {
             File installationDir = installationLocation.getLocation();
-            JvmInstallationMetadata metadata = metadataDetector.getMetadata(installationDir);
+            JvmInstallationMetadata metadata = metadataDetector.getMetadata(installationLocation);
             int actualVersion = Integer.parseInt(metadata.getLanguageVersion().getMajorVersion());
             return JavaHome.of(actualVersion, providers.provider(() -> installationDir));
         }).collect(Collectors.toList());

buildSrc/src/main/java/org/elasticsearch/hadoop/gradle/scala/SparkVariantPlugin.java

@@ -54,7 +54,6 @@
 import org.gradle.api.tasks.bundling.Jar;
 import org.gradle.api.tasks.scala.ScalaDoc;
 import org.gradle.api.tasks.testing.Test;
-import org.gradle.util.ConfigureUtil;
 
 import static org.gradle.api.plugins.JavaBasePlugin.DOCUMENTATION_GROUP;
 import static org.gradle.api.plugins.JavaBasePlugin.VERIFICATION_GROUP;
@@ -71,6 +70,8 @@
 import static org.gradle.api.tasks.SourceSet.MAIN_SOURCE_SET_NAME;
 import static org.gradle.api.tasks.SourceSet.TEST_SOURCE_SET_NAME;
 
+import org.elasticsearch.hadoop.gradle.util.ConfigureUtil;
+
 public class SparkVariantPlugin implements Plugin<Project> {
 
     public static class SparkVariant {

buildSrc/src/main/java/org/elasticsearch/hadoop/gradle/util/ConfigureUtil.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.elasticsearch.hadoop.gradle.util;
+
+import groovy.lang.Closure;
+import org.codehaus.groovy.runtime.GeneratedClosure;
+import org.gradle.api.Action;
+import org.gradle.internal.metaobject.DynamicObjectUtil;
+import org.gradle.internal.Actions;
+import org.gradle.internal.metaobject.ConfigureDelegate;
+import org.gradle.internal.metaobject.DynamicInvokeResult;
+import org.gradle.internal.metaobject.DynamicObject;
+import org.gradle.util.internal.ClosureBackedAction;
+
+import javax.annotation.Nullable;
+import java.util.Collection;
+import java.util.Map;
+
+import static org.gradle.util.internal.CollectionUtils.toStringList;
+
+public class ConfigureUtil {
+
+    /**
+     * Creates an action that uses the given closure to configure objects of type T.
+     */
+    public static <T> Action<T> configureUsing(@Nullable final Closure configureClosure) {
+        if (configureClosure == null) {
+            return Actions.doNothing();
+        }
+
+        return new WrappedConfigureAction<T>(configureClosure);
+    }
+
+    public static <T> T configure(@Nullable Closure configureClosure, T target) {
+        if (configureClosure == null) {
+            return target;
+        }
+
+        configureTarget(configureClosure, target, new ConfigureDelegate(configureClosure, target));
+
+        return target;
+    }
+
+
+    private static <T> void configureTarget(Closure configureClosure, T target, ConfigureDelegate closureDelegate) {
+        if (!(configureClosure instanceof GeneratedClosure)) {
+            new ClosureBackedAction<T>(configureClosure, Closure.DELEGATE_FIRST, false).execute(target);
+            return;
+        }
+
+        // Hackery to make closure execution faster, by short-circuiting the expensive property and method lookup on Closure
+        Closure withNewOwner = configureClosure.rehydrate(target, closureDelegate, configureClosure.getThisObject());
+        new ClosureBackedAction<T>(withNewOwner, Closure.OWNER_ONLY, false).execute(target);
+    }
+
+    public static class WrappedConfigureAction<T> implements Action<T> {
+        private final Closure configureClosure;
+
+        WrappedConfigureAction(Closure configureClosure) {
+            this.configureClosure = configureClosure;
+        }
+
+        @Override
+        public void execute(T t) {
+            configure(configureClosure, t);
+        }
+
+        public Closure getConfigureClosure() {
+            return configureClosure;
+        }
+    }
+}

gradle.properties

@@ -3,6 +3,7 @@ systemProp.org.gradle.warning.mode=fail
 
 ## Settings
 org.gradle.daemon=false
+org.gradle.jvmargs=-Xmx4g
 
 # java homes resolved by environment variables
 org.gradle.java.installations.auto-detect=false

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal