Apache Lucene open-source search software
deps(java): bump gradle-wrapper from 9.6.1 to 9.7.0 (#16522)
dependabot[bot]cab347c0230e
diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/CodeCoveragePlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/CodeCoveragePlugin.javaindex b504186a02f..3b5609a15a8 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/CodeCoveragePlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/CodeCoveragePlugin.java@@ -17,6 +17,7 @@package org.apache.lucene.gradle.plugins.java;import java.io.File;+import java.util.Map;import org.apache.lucene.gradle.plugins.LuceneGradlePlugin;import org.barfuin.gradle.jacocolog.JacocoLogPlugin;import org.gradle.api.Project;@@ -66,7 +67,9 @@ public class CodeCoveragePlugin extends LuceneGradlePlugin {.forEach(p -> {if (p.file("src/test").exists()) {- project.getDependencies().add("jacocoAggregation", p);+ var dependencies = project.getDependencies();+ dependencies.add(+ "jacocoAggregation", dependencies.project(Map.of("path", p.getPath())));}});diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/RenderJavadocPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/RenderJavadocPlugin.javaindex e34543db1e5..c6b41a24951 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/RenderJavadocPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/RenderJavadocPlugin.java@@ -83,7 +83,9 @@ public class RenderJavadocPlugin extends LuceneGradlePlugin {getProjectRootPath(project).resolve("gradle/documentation/render-javadoc").toFile();var missingdocletConfiguration = project.getConfigurations().create("missingdoclet");- project.getDependencies().add("missingdoclet", project.project(":build-tools:missing-doclet"));+ var dependencies = project.getDependencies();+ dependencies.add(+ "missingdoclet", dependencies.project(Map.of("path", ":build-tools:missing-doclet")));TaskContainer tasks = project.getTasks();var renderJavadoc =diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/licenses/CheckLicensesTask.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/licenses/CheckLicensesTask.javaindex 8b06ce040ab..43191baa2dd 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/licenses/CheckLicensesTask.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/licenses/CheckLicensesTask.java@@ -34,14 +34,18 @@ import java.util.TreeMap;import java.util.function.Predicate;import java.util.stream.Collectors;import java.util.stream.Stream;+import javax.inject.Inject;import org.gradle.api.DefaultTask;import org.gradle.api.GradleException;import org.gradle.api.file.ConfigurableFileCollection;+import org.gradle.api.file.DirectoryProperty;+import org.gradle.api.file.ProjectLayout;import org.gradle.api.file.RegularFileProperty;import org.gradle.api.provider.Property;import org.gradle.api.tasks.CacheableTask;import org.gradle.api.tasks.Input;import org.gradle.api.tasks.InputFiles;+import org.gradle.api.tasks.Internal;import org.gradle.api.tasks.OutputFile;import org.gradle.api.tasks.PathSensitive;import org.gradle.api.tasks.PathSensitivity;@@ -119,8 +123,17 @@ public abstract class CheckLicensesTask extends DefaultTask {@OutputFilepublic abstract RegularFileProperty getReportFile();- public CheckLicensesTask() {+ /**+ * The root directory; input file paths are reported relative to this directory. Defaults to the+ * settings directory.+ */+ @Internal+ public abstract DirectoryProperty getRootDir();++ @Inject+ public CheckLicensesTask(ProjectLayout layout) {getMaxScannedHeaderSize().convention(DEFAULT_SCANNED_HEADER);+ getRootDir().convention(layout.getSettingsDirectory());}@TaskAction@@ -242,7 +255,7 @@ public abstract class CheckLicensesTask extends DefaultTask {/** Convert the given path to a root-project-relative path with unix path separators. */private String toRootRelative(File file) {- Path root = getProject().getRootDir().toPath().normalize();+ Path root = getRootDir().get().getAsFile().toPath().normalize();Path p = file.toPath().toAbsolutePath().normalize();String key = root.relativize(p).toString();if (File.separatorChar != '/') {diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 35ed83156dd..65530f1f25a 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -36,7 +36,7 @@ jts = "1.20.0"junit = "4.13.2"junit5 = "6.1.3"# @keep Minimum gradle version to run the build-minGradle = "9.6.1"+minGradle = "9.7.0"# @keep This is the minimum required Java version.minJava = "25"# analysis/morfologik polish supportdiff --git a/gradle/wrapper/gradle-wrapper.jar.sha256 b/gradle/wrapper/gradle-wrapper.jar.sha256index 01bf52d7082..78e8dbbd2eb 100644--- a/gradle/wrapper/gradle-wrapper.jar.sha256+++ b/gradle/wrapper/gradle-wrapper.jar.sha256@@ -1 +1 @@-497c8c2a7e5031f6aa847f88104aa80a93532ec32ee17bdb8d1d2f67a194a9c7 *gradle-wrapper.jar+7a9ce74cff467ca1bf60a4fcd9f05185acceda4d0f382434d393e17864262c5d *gradle-wrapper.jardiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex a9db11550c6..69dd0d0404a 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,6 +1,6 @@distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zipnetworkTimeout=10000retries=0retryBackOffMs=500diff --git a/lucene/core/build.gradle b/lucene/core/build.gradleindex 97eea60e8a1..67ed46aa207 100644--- a/lucene/core/build.gradle+++ b/lucene/core/build.gradle@@ -117,13 +117,18 @@ configure(project(":lucene:core")) {})}+// Resolve the version catalog entry in this script's scope; looking it up+// from within the configured project would trigger an implicit (deprecated)+// property lookup in parent projects.+def jflexDependency = deps.jflex+configure(project(":lucene:analysis:common")) {configurations {jflex}dependencies {- jflex deps.jflex+ jflex jflexDependency}def regenerateTlds = tasks.register("regenerateTlds", {diff --git a/lucene/distribution/build.gradle b/lucene/distribution/build.gradleindex 0c076d3e95e..19ee2a92a89 100644--- a/lucene/distribution/build.gradle+++ b/lucene/distribution/build.gradle@@ -98,7 +98,7 @@ dependencies {])}for (Project module : binaryModules) {- jars(module, {+ jars(project(module.path), {transitive = false})}