Fix assemble source release (#14800)

* Remove refs to the removed option: validation.git.failOnModified.

* Fix regression in assembleSourceTgz #14796

* Use allOptions in gradle upgrade workflow. Remove references to testOpts.

* Correct reference typo in jarInfoTasks.

* mustRunAfter doesn't include a subgraph of dependencies of a task, have to list them explicitly.

* Tidy.

Author: dweiss

.github/workflows/run-checks-gradle-upgrade.yml

@@ -85,10 +85,10 @@ jobs:
             git reset --hard && git clean -xfd .
           fi
 
-      - run: ./gradlew testOpts
+      - run: ./gradlew allOptions
       - run: ./gradlew helpWorkflow
       - run: ./gradlew licenses updateLicenses
-      - run: ./gradlew check -x test -Pvalidation.git.failOnModified=false
+      - run: ./gradlew check -x test
       - run: ./gradlew assembleRelease mavenToLocal
 
       # Conserve resources: only run these in non-alt-java mode.

build-tools/build-infra/src/main/groovy/lucene.documentation.gradle

@@ -29,7 +29,7 @@ configure(rootProject) {
           return null
         } else {
           // release build
-          return "https://lucene.apache.org/core/${urlVersion}"
+          return "https://lucene.apache.org/core/${urlVersion}".toString()
         }
       })
 

build-tools/build-infra/src/main/groovy/lucene.validation.jar-checks.gradle

@@ -297,7 +297,7 @@ configure(project(":lucene")) {
   def updateLicenses = tasks.register("updateLicenses", {
     group = 'Dependency validation'
     description = "Write or update checksums of dependencies. May need to run gradlew --write-locks first if changing dependency versions"
-    dependsOn "jarInfoTasks"
+    dependsOn jarInfoTasks
 
     doLast {
       licensesDir.asFile.mkdirs()
@@ -334,7 +334,13 @@ configure(project(":lucene")) {
   // We add an ordering constraint that any validation task (or its dependency subgraph)
   // must run after updateLicenses
   configure(subprojects) {
-    tasks.matching { it.name == "licenses" }.configureEach {
+    tasks.matching {
+      it.name in [
+        "licenses",
+        "validateJarChecksums",
+        "validateJarLicenses"
+      ]
+    }.configureEach {
       mustRunAfter updateLicenses
     }
   }

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

@@ -1,9 +1,19 @@
 package org.apache.lucene.gradle.plugins.gitinfo;
 
+import org.gradle.api.file.FileSystemLocation;
 import org.gradle.api.provider.MapProperty;
+import org.gradle.api.provider.Property;
 
 public abstract class GitInfoExtension {
   public static final String NAME = "gitinfo";
 
+  /**
+   * @return Return a map of key-value pairs extracted from the current git status.
+   */
   public abstract MapProperty<String, String> getGitInfo();
+
+  /**
+   * @return Return the location of {@code .git} directory (or file, if worktrees are used).
+   */
+  public abstract Property<FileSystemLocation> getDotGitDir();
 }

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

@@ -1,8 +1,11 @@
 package org.apache.lucene.gradle.plugins.gitinfo;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import org.gradle.api.GradleException;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.api.file.Directory;
 
 public class GitInfoPlugin implements Plugin<Project> {
   @Override
@@ -24,5 +27,33 @@ public void apply(Project project) {
         project.getExtensions().create(GitInfoExtension.NAME, GitInfoExtension.class);
 
     gitInfoExtension.getGitInfo().value(gitInfoProvider).finalizeValueOnRead();
+
+    gitInfoExtension
+        .getDotGitDir()
+        .convention(
+            project
+                .getProviders()
+                .provider(
+                    () -> {
+                      Directory projectDirectory =
+                          project.getRootProject().getLayout().getProjectDirectory();
+                      Path gitLocation = projectDirectory.getAsFile().toPath().resolve(".git");
+                      if (!Files.exists(gitLocation)) {
+                        throw new GradleException(
+                            "Can't locate .git (probably not a git clone?): "
+                                + gitLocation.toAbsolutePath());
+                      }
+
+                      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();
   }
 }

dev-tools/scripts/buildAndPushRelease.py

@@ -130,8 +130,6 @@ def prepare(root: str, version: str, pause_before_sign: bool, gpg_key_id: str |
 
   print("  prepare-release")
   cmd = "./gradlew --stacktrace --no-daemon assembleRelease -Dversion.release=%s" % version
-  if dev_mode:
-    cmd += " -Pvalidation.git.failOnModified=false"
   if gpg_key_id is not None:
     cmd += " -Psign --max-workers 2"
     if sign_gradle:

help/tests.txt

@@ -42,10 +42,14 @@ gradlew :lucene:misc:test -Ptests.seed=DEADBEEF
 
 There are a lot of other test randomization properties
 available. To list them, their defaults and current values
-run the testOpts task against a project that has tests.
+run the 'buildOptions' task against a project that has tests.
 For example:
 
-gradlew -p lucene/core testOpts
+gradlew -p lucene/core buildOptions
+
+or list all options with:
+
+gradlew allOptions
 
 
 Filtering

lucene/analysis/common/build.gradle

@@ -92,7 +92,7 @@ def cloningTasks = dictionaryProjects.collect { repoSpec ->
           workingDir dotGitPath.getParent().toString()
           args = cmdArgs
 
-          // An explicit GIT_DIR to prevent .git upward scanning if something goes wrong.
+          // An explicit GIT_DIR to prevent .git upward scanning.
           environment("GIT_DIR", dotGitPath.toString())
         }
       }

lucene/distribution/build.gradle

@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 
+
+import org.apache.lucene.gradle.plugins.gitinfo.GitInfoExtension
+
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 
@@ -33,7 +36,8 @@ ext {
 }
 
 // Collect git revision.
-MapProperty<String, String> gitStatus = rootProject.extensions.getByName("gitinfo").getGitInfo()
+GitInfoExtension gitInfoExt = rootProject.extensions.getByName("gitinfo")
+MapProperty<String, String> gitStatus = gitInfoExt.getGitInfo()
 Provider<String> gitRev = gitStatus.getting("git.commit")
 
 // Prepare the "source" distribution artifact. We use raw git export, no additional complexity needed.
@@ -51,7 +55,7 @@ tasks.register("assembleSourceTgz", {
       workingDir = project.rootDir
 
       // An explicit GIT_DIR to prevent .git upward scanning if something goes wrong.
-      environment("GIT_DIR", dotGitPath.toString())
+      environment("GIT_DIR", gitInfoExt.getDotGitDir().get().asFile)
 
       args += [
         "archive",