Upgrade to gradle 8.10

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

@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        java-version: [ '22' ]
+        java-version: [ '23-ea' ]
         uses-alt-java: [ true, false ]
 
     runs-on: ${{ matrix.os }}
@@ -61,15 +61,24 @@ jobs:
           # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable
           echo "RUNTIME_JAVA_HOME=${{ env.ALT_JAVA_DIR }}" >> "$GITHUB_ENV"
 
-      - run: ./gradlew -p lucene/core check -x test
+      - name: ./gradlew tidy
+        run: |
+          ./gradlew tidy
+          if [ ! -z "$(git status --porcelain)" ]; then
+          echo ":warning: **tidy left local checkout in modified state**" >> $GITHUB_STEP_SUMMARY
+          echo '```' >> $GITHUB_STEP_SUMMARY
+          git status --porcelain >> $GITHUB_STEP_SUMMARY
+          echo '```' >> $GITHUB_STEP_SUMMARY
+          git reset --hard && git clean -xfd .
+          fi
 
       - name: ./gradlew regenerate
         run: |
           # add this package for generateEmojiTokenizationTestChecksumLoad.
           sudo apt-get install libwww-perl
           ./gradlew regenerate -x generateUAX29URLEmailTokenizerInternal --rerun-tasks
           if [ ! -z "$(git status --porcelain)" ]; then 
-            echo ":warning: **regenerateleft local checkout in modified state**" >> $GITHUB_STEP_SUMMARY 
+            echo ":warning: **regenerate left local checkout in modified state**" >> $GITHUB_STEP_SUMMARY 
             echo '```' >> $GITHUB_STEP_SUMMARY
             git status --porcelain >> $GITHUB_STEP_SUMMARY
             echo '```' >> $GITHUB_STEP_SUMMARY
@@ -79,8 +88,7 @@ jobs:
       - run: ./gradlew testOpts
       - run: ./gradlew helpWorkflow
       - run: ./gradlew licenses updateLicenses
-      - run: ./gradlew tidy
-      - run: ./gradlew check -x test
+      - run: ./gradlew check -x test -Pvalidation.git.failOnModified=false
       - run: ./gradlew assembleRelease mavenToLocal
 
       # Conserve resources: only run these in non-alt-java mode.

build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java

@@ -60,8 +60,8 @@ public static void main(String[] args) {
 
   public static void checkVersion() {
     int major = Runtime.version().feature();
-    if (major != 21 && major != 22) {
-      throw new IllegalStateException("java version must be 21 or 22, your version: " + major);
+    if (major != 21 && major != 22 && major != 23) {
+      throw new IllegalStateException("java version must be 21, 22 or 23, your version: " + major);
     }
   }
 

gradle/documentation/render-javadoc.gradle

@@ -32,7 +32,7 @@ allprojects {
       missingdoclet "org.apache.lucene.tools:missing-doclet"
     }
 
-    ext {
+    project.ext {
       relativeDocPath = project.path.replaceFirst(/:\w+:/, "").replace(':', '/')
     }
 

gradle/generation/kuromoji.gradle

@@ -33,7 +33,7 @@ configure(project(":lucene:analysis:kuromoji")) {
   apply plugin: deps.plugins.undercouch.download.get().pluginId
 
   plugins.withType(JavaPlugin) {
-    ext {
+    project.ext {
       targetDir = file("src/resources")
     }
 

gradle/generation/nori.gradle

@@ -33,7 +33,7 @@ configure(project(":lucene:analysis:nori")) {
   apply plugin: deps.plugins.undercouch.download.get().pluginId
 
   plugins.withType(JavaPlugin) {
-    ext {
+    project.ext {
       targetDir = file("src/resources")
     }
 

gradle/testing/beasting.gradle

@@ -27,7 +27,7 @@ def beastingMode = gradle.startParameter.taskNames.any{ name -> name == 'beast'
 
 allprojects {
   plugins.withType(JavaPlugin) {
-    ext {
+    project.ext {
       testOptions += [
           [propName: 'tests.dups', value: 0, description: "Reiterate runs of entire test suites ('beast' task)."]
       ]

gradle/testing/profiling.gradle

@@ -19,7 +19,7 @@ def recordings = files()
 
 allprojects {
   plugins.withType(JavaPlugin) {
-    ext {
+    project.ext {
       testOptions += [
           [propName: 'tests.profile', value: false, description: "Enable Java Flight Recorder profiling."]
       ]

gradle/testing/randomization.gradle

@@ -62,7 +62,7 @@ allprojects {
 // Configure test property defaults and their descriptions.
 allprojects {
   plugins.withType(JavaPlugin) {
-    ext {
+    project.ext {
       String randomVectorSize = RandomPicks.randomFrom(new Random(projectSeedLong), ["default", "128", "256", "512"])
       testOptions += [
           // seed, repetition and amplification.
@@ -135,14 +135,14 @@ allprojects {
     }
 
     afterEvaluate {
-      ext.testOptionsResolved = testOptions.findAll { opt ->
+      project.ext.testOptionsResolved = testOptions.findAll { opt ->
         propertyOrDefault(opt.propName, opt.value) != null
       }.collectEntries { opt ->
         [(opt.propName): Objects.toString(resolvedTestOption(opt.propName))]
       }
 
       // Compute the "reproduce with" string.
-      ext.testOptionsForReproduceLine = testOptions.findAll { opt ->
+      project.ext.testOptionsForReproduceLine = testOptions.findAll { opt ->
         if (opt["includeInReproLine"] == false) {
           return false
         }

gradle/testing/slowest-tests-at-end.gradle

@@ -22,7 +22,7 @@ def allSuites = []
 
 allprojects {
   plugins.withType(JavaPlugin) {
-    ext {
+    project.ext {
       testOptions += [
           [propName: 'tests.slowestTests', value: true, description: "Print the summary of the slowest tests."],
           [propName: 'tests.slowestSuites', value: true, description: "Print the summary of the slowest suites."]

gradle/wrapper/gradle-wrapper.jar.sha256

@@ -1 +1 @@
-cb0da6751c2b753a16ac168bb354870ebb1e162e9083f116729cec9c781156b8
+2db75c40782f5e8ba1fc278a5574bab070adccb2d21ca5a6e5ed840888448046

gradle/wrapper/gradle-wrapper.jar.version

@@ -1 +1 @@
-8.8.0
+8.10.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

lucene/CHANGES.txt

@@ -266,6 +266,8 @@ Build
 
 * GITHUB#13649: Fix eclipse ide settings generation #13649 (Uwe Schindler, Dawid Weiss)
 
+* GITHUB#13698: Upgrade to gradle 8.10 (Dawid Weiss)
+
 ======================== Lucene 9.12.0 =======================
 
 API Changes

lucene/demo/src/java/org/apache/lucene/demo/facet/SandboxFacetsExample.java

@@ -148,9 +148,10 @@ List<FacetResult> facetsOnly() throws IOException {
     FacetFieldCollectorManager<CountFacetRecorder> collectorManager =
         new FacetFieldCollectorManager<>(defaultTaxoCutter, defaultRecorder);
 
-    //// (2.1) if we need to collect data using multiple different collectors, e.g. taxonomy and
-    ////       ranges, or even two taxonomy facets that use different Category List Field, we can
-    ////       use MultiCollectorManager, e.g.:
+    // (2.1) if we need to collect data using multiple different collectors, e.g. taxonomy and
+    // ranges, or even two taxonomy facets that use different Category List Field, we can
+    // use MultiCollectorManager, e.g.:
+    //
     // TODO: add a demo for it.
     // TaxonomyFacetsCutter publishDateCutter = new
     // TaxonomyFacetsCutter(config.getDimConfig("Publish Date"), taxoReader);

lucene/distribution/binary-release.gradle

@@ -37,9 +37,9 @@ configure(project(":lucene:distribution")) {
 
     // Maven-published submodule JARs are part of the binary distribution.
     // We don't copy their transitive dependencies.
-    def binaryModules = rootProject.ext.mavenProjects.findAll { p -> !(p in [
+    def binaryModules = rootProject.ext.mavenProjects.findAll { p -> !(p.path in [
       // Placed in a separate folder (module layer conflicts).
-      project(":lucene:test-framework"),
+      ":lucene:test-framework",
     ]) }
     for (Project module : binaryModules) {
       jars(module, {

versions.toml

@@ -9,7 +9,7 @@ errorprone = "2.18.0"
 flexmark = "0.61.24"
 # @keep This is GJF version for spotless/ tidy.
 googleJavaFormat = "1.23.0"
-groovy = "3.0.21"
+groovy = "4.0.22"
 hamcrest = "2.2"
 icu4j = "74.2"
 javacc = "7.0.12"
@@ -19,7 +19,7 @@ jmh = "1.37"
 jts = "1.17.0"
 junit = "4.13.1"
 # @keep Minimum gradle version to run the build
-minGradle = "8.8"
+minGradle = "8.10"
 # @keep This is the minimum required Java version.
 minJava = "21"
 morfologik = "2.1.9"
@@ -49,7 +49,7 @@ flexmark-ext-abbreviation = { module = "com.vladsch.flexmark:flexmark-ext-abbrev
 flexmark-ext-attributes = { module = "com.vladsch.flexmark:flexmark-ext-attributes", version.ref = "flexmark" }
 flexmark-ext-autolink = { module = "com.vladsch.flexmark:flexmark-ext-autolink", version.ref = "flexmark" }
 flexmark-ext-tables = { module = "com.vladsch.flexmark:flexmark-ext-tables", version.ref = "flexmark" }
-groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
+groovy = { module = "org.apache.groovy:groovy-all", version.ref = "groovy" }
 hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "hamcrest" }
 icu4j = { module = "com.ibm.icu:icu4j", version.ref = "icu4j" }
 javacc = { module = "net.java.dev.javacc:javacc", version.ref = "javacc" }