Update Gradle wrapper to 8.8 (#2232)

* Update Gradle wrapper to 8.8
* fix 8.8 deprecations
* Fix deprecation warning from shadow plugin

Author: breskeby

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

@@ -70,6 +70,15 @@ import javax.inject.Inject
 
 import static org.elasticsearch.hadoop.gradle.scala.SparkVariantPlugin.SparkVariantPluginExtension
 import static org.elasticsearch.hadoop.gradle.scala.SparkVariantPlugin.SparkVariant
+import org.gradle.api.artifacts.ResolvableDependencies;
+import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.artifacts.result.ResolvedComponentResult;
+import org.gradle.api.artifacts.result.ResolvedDependencyResult;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.specs.AndSpec;
+import org.gradle.api.specs.Spec;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import java.util.stream.Collectors;
 
 class BuildPlugin implements Plugin<Project>  {
 
@@ -845,10 +854,8 @@ class BuildPlugin implements Plugin<Project>  {
         precommitTasks.add(licenseHeaders)
 
         if (!project.path.startsWith(":qa")) {
-            TaskProvider<DependencyLicensesTask> dependencyLicenses = project.tasks.register('dependencyLicenses', DependencyLicensesTask.class) {
-                dependencies = project.configurations.runtimeClasspath.fileCollection {
-                    !(it instanceof ProjectDependency)
-                }
+            TaskProvider<DependencyLicensesTask> dependencyLicenses = project.tasks.register('dependencyLicenses', DependencyLicensesTask.class) {                
+                dependencies = project.configurations.runtimeClasspath
                 mapping from: /hadoop-.*/, to: 'hadoop'
                 mapping from: /hive-.*/, to: 'hive'
                 mapping from: /jackson-.*/, to: 'jackson'

buildSrc/src/main/java/org/elasticsearch/hadoop/gradle/buildtools/DependencyLicensesTask.java

@@ -51,6 +51,16 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import org.gradle.api.artifacts.ResolvableDependencies;
+import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.artifacts.result.ResolvedComponentResult;
+import org.gradle.api.artifacts.result.ResolvedDependencyResult;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.specs.AndSpec;
+import org.gradle.api.specs.Spec;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import java.util.stream.Collectors;
+import org.gradle.api.artifacts.Configuration;
 
 /**
  * A task to check licenses for dependencies.
@@ -94,7 +104,7 @@
  * for the dependency. This artifact will be redistributed by us with the release to
  * comply with the license terms.
  */
-public class DependencyLicensesTask extends DefaultTask {
+public abstract class DependencyLicensesTask extends DefaultTask {
 
     private final Pattern regex = Pattern.compile("-v?\\d+.*");
 
@@ -148,7 +158,28 @@ public FileCollection getDependencies() {
         return dependencies;
     }
 
-    public void setDependencies(FileCollection dependencies) {
+    public void setDependencies(Configuration configuration) {
+        ResolvableDependencies incoming = configuration.getIncoming();
+        dependencies = incoming.artifactView(viewConfiguration -> {
+            Set<ComponentIdentifier> firstLevelDependencyComponents = incoming.getResolutionResult()
+                .getRootComponent()
+                .map(rootComponent -> rootComponent.getDependencies()
+                        .stream()
+                        .filter(dependency -> dependency instanceof ResolvedDependencyResult)
+                        .map(dependency -> (ResolvedDependencyResult) dependency)
+                        .filter(dependency -> dependency.getSelected() instanceof ResolvedComponentResult)
+                        .map(dependency -> dependency.getSelected().getId())
+                        .collect(Collectors.toSet())
+                ).get();
+            Spec<ComponentIdentifier> componentFilter = (identifier -> identifier instanceof ModuleComponentIdentifier
+                    && ((ModuleComponentIdentifier) identifier).getGroup().startsWith("org.elasticsearch") == false);
+            Spec<ComponentIdentifier> firstLevelFilter = (identifier -> firstLevelDependencyComponents.contains(identifier));
+            viewConfiguration.componentFilter(
+                new AndSpec<>(firstLevelFilter, componentFilter)
+            );
+        }).getFiles();
+
+
         this.dependencies = dependencies;
     }
 

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

@@ -200,7 +200,7 @@ private List<JavaHome> getAvailableJavaVersions() {
     private Stream<InstallationLocation> getAvailableJavaInstallationLocationSteam() {
         return Stream.concat(
             javaInstallationRegistry.toolchains().stream().map(metadata -> metadata.location),
-            Stream.of(new InstallationLocation(Jvm.current().getJavaHome(), "Current JVM"))
+            Stream.of(InstallationLocation.userDefined(Jvm.current().getJavaHome(), "Current JVM"))
         );
     }
 

dist/build.gradle

@@ -195,7 +195,5 @@ task generateDependenciesReport(type: ConcatFilesTask) { concatDepsTask ->
 }
 
 project.tasks.named('dependencyLicenses', DependencyLicensesTask) {
-    it.dependencies = project.configurations.licenseChecks.fileCollection {
-        !(it instanceof ProjectDependency)
-    }
+    it.dependencies = project.configurations.licenseChecks
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew

@@ -1,10 +1,26 @@
 import org.elasticsearch.hadoop.gradle.BuildPlugin
 
+
+
+buildscript {
+  repositories {
+    maven {
+      url 'https://jitpack.io'
+    }
+    mavenCentral()
+  }
+  dependencies {
+    classpath 'com.github.breskeby:shadow:3b035f2'
+  }
+}
+
 plugins {
-    id 'com.github.johnrengelman.shadow'
     id 'es.hadoop.build'
 }
 
+apply plugin: 'com.github.johnrengelman.shadow'
+
+
 description = "Elasticsearch Hadoop Shaded Third-Party Libraries"
 
 configurations {