Revert "Use git-ls-files as the source of file paths for license checks. (#15200)"

This reverts commit 5227fd7.

Author: dweiss

.hgignore

@@ -0,0 +1,4 @@
+syntax: glob
+*/build/*
+*.class
+

build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/gitinfo/GitFileListValueSource.java

@@ -17,7 +17,6 @@
 package org.apache.lucene.gradle.plugins.gitinfo;
 
 import org.gradle.api.file.FileSystemLocation;
-import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
 
@@ -33,10 +32,4 @@ public abstract class GitInfoExtension {
    * @return Return the location of {@code .git} directory (or file, if worktrees are used).
    */
   public abstract Property<FileSystemLocation> getDotGitDir();
-
-  /**
-   * @return Return a set of all versioned and non-versioned files (that are not ignored by {@code
-   *     .gitignore}).
-   */
-  public abstract ListProperty<String> getAllNonIgnoredProjectFiles();
 }

build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/gitinfo/GitInfoExtension.java

@@ -19,68 +19,55 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import org.apache.lucene.gradle.plugins.LuceneGradlePlugin;
-import org.apache.lucene.gradle.plugins.globals.LuceneBuildGlobalsExtension;
-import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.file.Directory;
-import org.gradle.api.file.FileSystemLocation;
-import org.gradle.api.provider.Property;
-import org.gradle.api.provider.ValueSourceSpec;
 
 public class GitInfoPlugin extends LuceneGradlePlugin {
   @Override
   public void apply(Project project) {
     applicableToRootProjectOnly(project);
 
+    var gitInfoProvider =
+        project
+            .getProviders()
+            .of(
+                GitInfoValueSource.class,
+                spec -> {
+                  spec.getParameters().getRootProjectDir().set(project.getProjectDir());
+                });
+
     var gitInfoExtension =
         project.getExtensions().create(GitInfoExtension.NAME, GitInfoExtension.class);
-    var providers = project.getProviders();
-
-    Property<FileSystemLocation> dotGitDir = gitInfoExtension.getDotGitDir();
-    dotGitDir
-        .convention(
-            providers.provider(
-                () -> {
-                  Directory projectDirectory =
-                      project.getRootProject().getLayout().getProjectDirectory();
-                  Path gitLocation = projectDirectory.getAsFile().toPath().resolve(".git");
-                  if (!Files.exists(gitLocation)) {
-                    // don't return anything from the provider if we can't locate the .git
-                    // folder. This will result in the property returning false from isPresent.
-                    return null;
-                  }
-
-                  if (Files.isDirectory(gitLocation)) {
-                    return projectDirectory.dir(".git");
-                  } else if (Files.isRegularFile(gitLocation)) {
-                    return projectDirectory.file(".git");
-                  } else {
-                    throw new GradleException(
-                        "Panic, .git location not a directory or file: "
-                            + gitLocation.toAbsolutePath());
-                  }
-                }))
-        .finalizeValueOnRead();
 
-    var gitExec =
-        project.getExtensions().getByType(LuceneBuildGlobalsExtension.class).externalTool("git");
-
-    Action<ValueSourceSpec<GitValueSourceParameters>> configureGitParams =
-        spec -> {
-          var params = spec.getParameters();
-          params.getRootProjectDir().set(project.getProjectDir());
-          params.getGitExec().set(gitExec);
-          params.getDotDir().set(dotGitDir);
-        };
+    gitInfoExtension.getGitInfo().value(gitInfoProvider).finalizeValueOnRead();
 
     gitInfoExtension
-        .getGitInfo()
-        .value(providers.of(GitInfoValueSource.class, configureGitParams))
-        .finalizeValueOnRead();
+        .getDotGitDir()
+        .convention(
+            project
+                .getProviders()
+                .provider(
+                    () -> {
+                      Directory projectDirectory =
+                          project.getRootProject().getLayout().getProjectDirectory();
+                      Path gitLocation = projectDirectory.getAsFile().toPath().resolve(".git");
+                      if (!Files.exists(gitLocation)) {
+                        // don't return anything from the provider if we can't locate the .git
+                        // folder. This will result in the property returning false from isPresent.
+                        return null;
+                      }
 
-    gitInfoExtension
-        .getAllNonIgnoredProjectFiles()
-        .value(providers.of(GitFileListValueSource.class, configureGitParams));
+                      if (Files.isDirectory(gitLocation)) {
+                        return projectDirectory.dir(".git");
+                      } else if (Files.isRegularFile(gitLocation)) {
+                        return projectDirectory.file(".git");
+                      } else {
+                        throw new GradleException(
+                            "Panic, .git location not a directory or file: "
+                                + gitLocation.toAbsolutePath());
+                      }
+                    }))
+        .finalizeValueOnRead();
   }
 }

build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/gitinfo/GitInfoPlugin.java

@@ -25,12 +25,19 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import org.apache.tools.ant.taskdefs.condition.Os;
 import org.gradle.api.GradleException;
+import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.provider.ValueSource;
+import org.gradle.api.provider.ValueSourceParameters;
+import org.gradle.api.services.BuildServiceParameters;
 import org.gradle.process.ExecOperations;
 
 public abstract class GitInfoValueSource
-    implements ValueSource<Map<String, String>, GitValueSourceParameters> {
+    implements ValueSource<Map<String, String>, GitInfoValueSource.Parameters> {
+  public abstract static class Parameters implements BuildServiceParameters, ValueSourceParameters {
+    public abstract DirectoryProperty getRootProjectDir();
+  }
 
   @Inject
   public abstract ExecOperations getExecOps();
@@ -47,9 +54,9 @@ public Map<String, String> obtain() {
                     spec.setErrorOutput(out);
                     spec.setIgnoreExitValue(true);
 
-                    getParameters().configure(spec);
-
-                    spec.setExecutable(getParameters().getGitExec().get());
+                    spec.setWorkingDir(
+                        getParameters().getRootProjectDir().getAsFile().get().getAbsolutePath());
+                    spec.setExecutable(Os.isFamily(Os.FAMILY_WINDOWS) ? "git.exe" : "git");
                     spec.args("status", "--porcelain=v2", "--branch");
                   });
       out.flush();