Merge branch 'main' into use-record-classes

Author: shubhamvishu

.gitattributes

@@ -1,6 +1,6 @@
 # Ignore all differences in line endings for the lock file.
-versions.lock text eol=lf
-versions.props text eol=lf
+versions.lock  text eol=lf
+versions.toml  text eol=lf
 
 # Gradle files are always in LF.
 *.gradle          text eol=lf

.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.

.github/workflows/run-nightly-smoketester.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        java-version: [ '21', '22' ]
+        java-version: [ '21', '22', '23-ea' ]
 
     runs-on: ${{ matrix.os }}
 

README.md

@@ -23,6 +23,7 @@ Apache Lucene is a high-performance, full-featured text search engine library
 written in Java.
 
 [![Build Status](https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-main/badge/icon?subject=Lucene)](https://ci-builds.apache.org/job/Lucene/job/Lucene-Artifacts-main/)
+[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.apache.org/scans?search.buildToolType=gradle&search.rootProjectNames=lucene-root)
 
 ## Online Documentation
 

buildSrc/build.gradle renamed to build-tools/build-infra/build.gradle

@@ -15,30 +15,50 @@
  * limitations under the License.
  */
 
-repositories {
-  mavenCentral()
+plugins {
+  id "java-gradle-plugin"
+  alias(deps.plugins.spotless) apply false
+  alias(deps.plugins.forbiddenapis) apply false
 }
 
-ext {
-  // Minimum Java version required to compile buildSrc.
-  minJavaVersion = JavaVersion.VERSION_21
+repositories {
+  mavenCentral()
 }
 
+group = "org.apache"
 
 // Make sure the build environment is consistent.
-apply from: file('../gradle/validation/check-environment.gradle')
+apply from: file('../../gradle/conventions.gradle')
+apply from: file('../../gradle/validation/check-environment.gradle')
+
+// Add spotless/ tidy.
+tasks.register("checkJdkInternalsExportedToGradle") {}
+apply from: file('../../gradle/validation/spotless.gradle')
+apply from: file('../../gradle/validation/forbidden-apis.gradle')
 
-// Load common buildSrc and script deps.
-apply from: file("scriptDepVersions.gradle")
+java {
+  sourceCompatibility = JavaVersion.toVersion(deps.versions.minJava.get())
+  targetCompatibility = JavaVersion.toVersion(deps.versions.minJava.get())
+}
+
+gradlePlugin {
+  automatedPublishing = false
+
+  plugins {
+    buildInfra {
+      id = 'lucene.build-infra'
+      implementationClass = 'org.apache.lucene.gradle.buildinfra.BuildInfraPlugin'
+    }
+  }
+}
 
 dependencies {
   implementation gradleApi()
   implementation localGroovy()
-
-  implementation "commons-codec:commons-codec:${scriptDepVersions['commons-codec']}"
+  implementation deps.commons.codec
 }
 
-if (!rootProject.hasJavaFlightRecorder) {
+if (!hasJavaFlightRecorder) {
   logger.warn('Module jdk.jfr is not available; skipping compilation of Java Flight Recorder support.')
   tasks.named('compileJava').configure {
     exclude('**/ProfileResults.java')

dev-tools/missing-doclet/build.gradle renamed to build-tools/build-infra/settings.gradle

@@ -15,18 +15,12 @@
  * limitations under the License.
  */
 
-plugins {
-  id 'java-library'
-}
-
-version = "1.0.0-SNAPSHOT"
-group = "org.apache.lucene.tools"
-description = 'Doclet-based javadoc validation'
-
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
+rootProject.name = 'build-infra'
 
-tasks.withType(JavaCompile) {
-  options.compilerArgs += ["--release", targetCompatibility.toString()]
-  options.encoding = "UTF-8"
+dependencyResolutionManagement {
+    versionCatalogs {
+        deps {
+            from(files('../../versions.toml'))
+        }
+    }
 }

buildSrc/src/main/java/org/apache/lucene/gradle/Checksum.java renamed to build-tools/build-infra/src/main/java/org/apache/lucene/gradle/Checksum.java

@@ -27,6 +27,11 @@
 
 package org.apache.lucene.gradle;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Locale;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
@@ -39,16 +44,10 @@
 import org.gradle.work.Incremental;
 import org.gradle.work.InputChanges;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.Locale;
-
 public class Checksum extends DefaultTask {
   private FileCollection files;
   private File outputDir;
-  private Algorithm algorithm;
+  private Algorithm algorithm = Algorithm.SHA512;
 
   public enum Algorithm {
     MD5(new DigestUtils(DigestUtils.getMd5Digest())),
@@ -69,7 +68,6 @@ public String getExtension() {
 
   public Checksum() {
     outputDir = new File(getProject().getBuildDir(), "checksums");
-    algorithm = Algorithm.SHA256;
   }
 
   @InputFiles
@@ -190,6 +188,8 @@ private FileCollection allPossibleChecksumFiles() {
 
   private FileCollection filesFor(final Algorithm algo) {
     return getProject()
-        .fileTree(getOutputDir(), files -> files.include("**/*." + algo.toString().toLowerCase(Locale.ROOT)));
+        .fileTree(
+            getOutputDir(),
+            files -> files.include("**/*." + algo.toString().toLowerCase(Locale.ROOT)));
   }
 }