Fix Gradle 8 deprecation warnings (#2071)

Fix dependency info generation on the way

Author: breskeby

build.gradle

@@ -43,12 +43,3 @@ if (project.hasProperty("find-artifact")) {
         }
     }
 }
-
-// Add a task in the project that collects all the dependencyReport data for each project
-// Concatenates the dependencies CSV files into a single file
-// usage: ./gradlew :dist:generateDependenciesReport -Dcsv=/tmp/deps.csv
-task generateDependenciesReport(type: ConcatFilesTask) {
-    files = fileTree(dir: project.rootDir,  include: '**/dependencies.csv' )
-    headerLine = "name,version,url,license"
-    target = new File(System.getProperty('csv')?: "${project.buildDir}/reports/dependencies/es-hadoop-dependencies.csv")
-}

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

@@ -507,18 +507,12 @@ 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.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')).getArchiveFile().get().getAsFile(),
-                        project.tasks.getByName(variant.taskName('javadocJar')).getArchiveFile().get().getAsFile(),
-                        project.tasks.getByName(variant.taskName('sourcesJar')).getArchiveFile().get().getAsFile()
-                )
             }
         }
 

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

@@ -25,6 +25,7 @@
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.file.ConfigurableFileCollection;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,30 +39,22 @@
 /**
  * Concatenates a list of files into one and removes duplicate lines.
  */
-public class ConcatFilesTask extends DefaultTask {
+public abstract class ConcatFilesTask extends DefaultTask {
 
     public ConcatFilesTask() {
         setDescription("Concat a list of files into one.");
     }
 
-    /** List of files to concatenate */
-    private FileTree files;
-
     /** line to add at the top of the target file */
     private String headerLine;
 
     private File target;
 
     private List<String> additionalLines = new ArrayList<>();
 
-    public void setFiles(FileTree files) {
-        this.files = files;
-    }
-
+    /** List of files to concatenate */
     @InputFiles
-    public FileTree getFiles() {
-        return files;
-    }
+    public abstract ConfigurableFileCollection getFiles();
 
     public void setHeaderLine(String headerLine) {
         this.headerLine = headerLine;

dist/build.gradle

@@ -183,9 +183,13 @@ distribution {
 
 // Add a task in the root project that collects all the dependencyReport data for each project
 // Concatenates the dependencies CSV files into a single file
-task generateDependenciesReport(type: ConcatFilesTask) {
-    dependsOn rootProject.allprojects.collect { it.tasks.withType(DependenciesInfoTask) }
-    files = fileTree(dir: project.rootDir,  include: '**/dependencies.csv' )
+task generateDependenciesReport(type: ConcatFilesTask) { concatDepsTask ->
+    rootProject.allprojects.collect { 
+        it.tasks.withType(DependenciesInfoTask) { depTask ->
+            concatDepsTask.dependsOn depTask
+            concatDepsTask.getFiles().from(depTask.outputFile)
+        }
+    }
     headerLine = "name,version,url,license"
     target = new File(System.getProperty('csv')?: "${project.buildDir}/reports/dependencies/es-hadoop-dependencies.csv")
 }