Apache Lucene open-source search software
deps(java): bump gradle-wrapper from 9.2.1 to 9.3.1 (#15623)
dependabot[bot]708248935406
diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.javaindex bb773ed291f..70c8c2b5739 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java@@ -38,6 +38,7 @@ import java.util.Locale;import java.util.Objects;import java.util.concurrent.TimeUnit;import java.util.logging.Logger;+import java.util.regex.Pattern;/*** Standalone class used to download the {@code gradle-wrapper.jar}.@@ -122,12 +123,28 @@ public class WrapperDownloader {}}- Path versionPath =- destination.resolveSibling(destination.getFileName().toString() + ".version");- if (!Files.exists(versionPath)) {- throw new IOException("Wrapper version file not found: " + versionPath);+ Path wrapperProperties =+ destination.resolveSibling(+ destination.getFileName().toString().replace(".jar", ".properties"));+ if (!Files.exists(wrapperProperties)) {+ throw new IOException("Wrapper property file not found: " + wrapperProperties);}- String wrapperVersion = Files.readString(versionPath, StandardCharsets.UTF_8).trim();++ Pattern versionPattern = Pattern.compile("gradle-(?<version>.+?)-bin.zip");+ String wrapperVersion =+ Files.readAllLines(wrapperProperties, StandardCharsets.UTF_8).stream()+ .map(+ line -> {+ var matcher = versionPattern.matcher(line);+ if (matcher.find()) {+ return matcher.group("version");+ } else {+ return null;+ }+ })+ .filter(Objects::nonNull)+ .findAny()+ .orElseThrow();MessageDigest digest = MessageDigest.getInstance("SHA-256");diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/TestsAndRandomizationPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/TestsAndRandomizationPlugin.javaindex 14edb234757..8874a40bd17 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/TestsAndRandomizationPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/TestsAndRandomizationPlugin.java@@ -20,35 +20,55 @@ import com.carrotsearch.gradle.buildinfra.buildoptions.BuildOptionsExtension;import com.carrotsearch.gradle.buildinfra.buildoptions.BuildOptionsPlugin;import com.carrotsearch.randomizedtesting.generators.RandomPicks;import java.io.File;+import java.io.IOException;+import java.lang.classfile.ClassFile;+import java.lang.classfile.ClassModel;import java.nio.file.Path;import java.util.LinkedHashSet;import java.util.List;import java.util.Random;import java.util.Set;+import javax.inject.Inject;import org.apache.lucene.gradle.plugins.LuceneGradlePlugin;import org.apache.lucene.gradle.plugins.globals.LuceneBuildGlobalsExtension;import org.apache.tools.ant.taskdefs.condition.Os;import org.apache.tools.ant.types.Commandline;+import org.gradle.api.Action;import org.gradle.api.GradleException;import org.gradle.api.JavaVersion;import org.gradle.api.Project;import org.gradle.api.file.Directory;import org.gradle.api.file.DirectoryProperty;import org.gradle.api.file.RegularFileProperty;+import org.gradle.api.internal.file.RelativeFile;+import org.gradle.api.internal.tasks.testing.ClassTestDefinition;+import org.gradle.api.internal.tasks.testing.TestDefinitionProcessor;+import org.gradle.api.internal.tasks.testing.TestFramework;+import org.gradle.api.internal.tasks.testing.WorkerTestDefinitionProcessorFactory;+import org.gradle.api.internal.tasks.testing.detection.TestFrameworkDetector;+import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter;+import org.gradle.api.internal.tasks.testing.junit.JUnitSpec;+import org.gradle.api.internal.tasks.testing.junit.JUnitTestDefinitionProcessorFactory;import org.gradle.api.invocation.Gradle;+import org.gradle.api.model.ObjectFactory;import org.gradle.api.plugins.JavaPlugin;import org.gradle.api.provider.Provider;import org.gradle.api.tasks.Delete;import org.gradle.api.tasks.InputFile;import org.gradle.api.tasks.Internal;+import org.gradle.api.tasks.Nested;import org.gradle.api.tasks.PathSensitive;import org.gradle.api.tasks.PathSensitivity;import org.gradle.api.tasks.TaskContainer;import org.gradle.api.tasks.compile.JavaCompile;import org.gradle.api.tasks.testing.Test;+import org.gradle.api.tasks.testing.TestFilter;+import org.gradle.api.tasks.testing.junit.JUnitOptions;import org.gradle.api.tasks.testing.logging.TestExceptionFormat;import org.gradle.api.tasks.testing.logging.TestLogEvent;+import org.gradle.internal.Factory;import org.gradle.process.CommandLineArgumentProvider;+import org.gradle.process.internal.worker.WorkerProcessBuilder;/** Sets up gradle's Test task configuration, including all kinds of randomized options */public class TestsAndRandomizationPlugin extends LuceneGradlePlugin {@@ -425,7 +445,18 @@ public class TestsAndRandomizationPlugin extends LuceneGradlePlugin {}task.setWorkingDir(testsCwd);- task.useJUnit();++ // do not use any of the existing gradle frameworks.+ // see https://github.com/gradle/gradle/issues/36508+ task.getTestFrameworkProperty()+ .set(+ project+ .getObjects()+ .newInstance(+ LuceneTestFramework.class,+ new Object[] {+ task.getFilter(), task.getTemporaryDirFactory(), task.getDryRun()+ }));task.setMinHeapSize(minHeapSizeOption.get());task.setMaxHeapSize(heapSizeOption.get());@@ -601,4 +632,114 @@ public class TestsAndRandomizationPlugin extends LuceneGradlePlugin {return defaultVectorizationOption.get();}++ public abstract static class LuceneTestFramework implements TestFramework {+ private final DefaultTestFilter filter;+ private final Factory<File> testTaskTemporaryDir;+ private final Provider<Boolean> dryRun;+ private TestFrameworkDetector detector =+ new TestFrameworkDetector() {+ private TestDefinitionProcessor<? super ClassTestDefinition> testDefinitionProcessor;++ @Override+ public void startDetection(+ TestDefinitionProcessor<? super ClassTestDefinition> testDefinitionProcessor) {+ this.testDefinitionProcessor = testDefinitionProcessor;+ }++ @Override+ public boolean processTestClass(RelativeFile testClassFile) {+ var cc =+ ClassFile.of(+ ClassFile.ConstantPoolSharingOption.NEW_POOL,+ ClassFile.DebugElementsOption.DROP_DEBUG,+ ClassFile.LineNumbersOption.DROP_LINE_NUMBERS,+ ClassFile.StackMapsOption.DROP_STACK_MAPS);++ try {+ ClassModel parsed = cc.parse(testClassFile.getFile().toPath());+ String internalName = parsed.thisClass().asInternalName().replace('/', '.');+ testDefinitionProcessor.processTestDefinition(new ClassTestDefinition(internalName));+ } catch (Exception e) {+ throw new RuntimeException(e);+ }++ return true;+ }++ @Override+ public void setTestClasses(List<File> testClasses) {}++ @Override+ public void setTestClasspath(List<File> classpath) {}+ };++ @Inject+ public LuceneTestFramework(+ DefaultTestFilter filter, Factory<File> testTaskTemporaryDir, Provider<Boolean> dryRun) {+ this.filter = filter;+ this.testTaskTemporaryDir = testTaskTemporaryDir;+ this.dryRun = dryRun;+ }++ @Inject+ protected abstract ObjectFactory getObjectFactory();++ @Override+ public TestFramework copyWithFilters(TestFilter newTestFilters) {+ var newTestFramework =+ this.getObjectFactory()+ .newInstance(+ LuceneTestFramework.class,+ new Object[] {newTestFilters, this.testTaskTemporaryDir, this.dryRun});+ newTestFramework.getOptions().copyFrom(this.getOptions());+ return newTestFramework;+ }++ @Override+ public WorkerTestDefinitionProcessorFactory<?> getProcessorFactory() {+ this.validateOptions();+ return new JUnitTestDefinitionProcessorFactory(+ new JUnitSpec(+ this.filter.toSpec(),+ this.getOptions().getIncludeCategories(),+ this.getOptions().getExcludeCategories(),+ this.dryRun.get()));+ }++ @Override+ public Action<WorkerProcessBuilder> getWorkerConfigurationAction() {+ return (workerProcessBuilder) -> {+ workerProcessBuilder.sharedPackages(new String[] {"junit.framework"});+ workerProcessBuilder.sharedPackages(new String[] {"junit.extensions"});+ workerProcessBuilder.sharedPackages(new String[] {"org.junit"});+ };+ }++ @Override+ @Nested+ public abstract JUnitOptions getOptions();++ @Override+ public TestFrameworkDetector getDetector() {+ return detector;+ }++ @Override+ public void close() throws IOException {+ this.detector = null;+ }++ private void validateOptions() {+ if (!this.getOptions().getIncludeCategories().isEmpty()+ || !this.getOptions().getExcludeCategories().isEmpty()) {+ throw new RuntimeException("Include and exclude categories are not supported in Lucene.");+ }+ }++ @Override+ public String getDisplayName() {+ return "JUnit";+ }+ }}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 2dbd4848df9..bddedab621e 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -35,7 +35,7 @@ jts = "1.20.0"# unit testsjunit = "4.13.2"# @keep Minimum gradle version to run the build-minGradle = "9.2.1"+minGradle = "9.3.1"# @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 f40da38b4dd..e2e79d7bf2f 100644--- a/gradle/wrapper/gradle-wrapper.jar.sha256+++ b/gradle/wrapper/gradle-wrapper.jar.sha256@@ -1 +1 @@-76805e32c009c0cf0dd5d206bddc9fb22ea42e84db904b764f3047de095493f3 *gradle-wrapper.jar+b3a875ddc1f044746e1b1a55f645584505f4a10438c1afea9f15e92a7c42ec13 *gradle-wrapper.jardiff --git a/gradle/wrapper/gradle-wrapper.jar.version b/gradle/wrapper/gradle-wrapper.jar.versiondeleted file mode 100644index 47da986f86f..00000000000--- a/gradle/wrapper/gradle-wrapper.jar.version+++ /dev/null@@ -1 +0,0 @@-9.1.0diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex 23449a2b543..37f78a6af83 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.2.1-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zipnetworkTimeout=10000validateDistributionUrl=truezipStoreBase=GRADLE_USER_HOMEdiff --git a/gradlew b/gradlewindex ededaedafa2..7edc3329c5c 100755--- a/gradlew+++ b/gradlew@@ -1,7 +1,7 @@#!/usr/bin/env sh#-# Copyright © 2015-2021 the original authors.+# Copyright © 2015 the original authors.## Licensed under the Apache License, Version 2.0 (the "License");# you may not use this file except in compliance with the License.@@ -114,7 +114,6 @@ case "$( uname )" in #(NONSTOP* ) nonstop=true ;;esac-CLASSPATH="\\\"\\\""# Determine the Java command to use to start the JVM.@@ -172,7 +171,6 @@ fi# For Cygwin or MSYS, switch paths to Windows format before running javaif "$cygwin" || "$msys" ; thenAPP_HOME=$( cygpath --path --mixed "$APP_HOME" )- CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )JAVACMD=$( cygpath --unix "$JAVACMD" )@@ -253,7 +251,6 @@ fiset -- \"-Dorg.gradle.appname=$APP_BASE_NAME" \- -classpath "$CLASSPATH" \-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \"$@"diff --git a/gradlew.bat b/gradlew.batindex 3f2e1ab3549..a12c0d39b59 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -70,8 +70,6 @@ goto fail:execute@rem Setup the command line-set CLASSPATH=-@rem START OF LUCENE CUSTOMIZATION@rem LUCENE-9471: workaround for gradle leaving junk temp. files behind.@@ -110,7 +108,7 @@ IF NOT EXIST "%APP_HOME%\gradle.properties" (@rem END OF LUCENE CUSTOMIZATION@rem Execute Gradle-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*:end@rem End local scope for the variables with windows NT shell@@ -119,7 +117,7 @@ goto fail:failWithJvmMessage@rem https://github.com/apache/lucene/pull/819-echo Error: Something went wrong. Make sure you're using Java version of exactly 24.+echo Error: Something went wrong. Make sure you're using the minimum required Java version to compile Lucene.:failrem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead ofdiff --git a/lucene/test-framework/src/generated/checksums/regenerateEmojiTokenizationTest.json b/lucene/test-framework/src/generated/checksums/regenerateEmojiTokenizationTest.jsonindex 33fec2ccb2c..575ff76c88a 100644--- a/lucene/test-framework/src/generated/checksums/regenerateEmojiTokenizationTest.json+++ b/lucene/test-framework/src/generated/checksums/regenerateEmojiTokenizationTest.json@@ -1,5 +1,5 @@{- "lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/EmojiTokenizationTestUnicode_12_1.java": "9c4bc3ce66359cbe1e20d8e3ee718cc90caf21a4",- "lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateEmojiTokenizationTest.pl": "b178c0ec31dc843d5b7a8ff4ae85601a00b0a89f",+ "lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/EmojiTokenizationTestUnicode_12_1.java": "5e771f9188b774ccd4fea87a9b8d53bc798f9095",+ "lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateEmojiTokenizationTest.pl": "d859fead98e8c4ca9d6fa37e8723bdd583708c73","property:unicodeVersion": "12.1"}diff --git a/lucene/test-framework/src/generated/checksums/regenerateJavaUnicodeWordBreakTest.json b/lucene/test-framework/src/generated/checksums/regenerateJavaUnicodeWordBreakTest.jsonindex 82d69df7567..5b5652e16fc 100644--- a/lucene/test-framework/src/generated/checksums/regenerateJavaUnicodeWordBreakTest.json+++ b/lucene/test-framework/src/generated/checksums/regenerateJavaUnicodeWordBreakTest.json@@ -1,5 +1,5 @@{"lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/WordBreakTestUnicode_12_1.java": "--",- "lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateJavaUnicodeWordBreakTest.pl": "ff0d692c51f777daa72e706c2f7e527e88aecb01",+ "lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateJavaUnicodeWordBreakTest.pl": "7e82363c86893919234395e5297e6995a9b687ea","property:unicodeVersion": "12.1"}diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/EmojiTokenizationTestUnicode_12_1.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/EmojiTokenizationTestUnicode_12_1.javaindex 0835ca0758f..fd82ba9a355 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/EmojiTokenizationTestUnicode_12_1.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/EmojiTokenizationTestUnicode_12_1.java@@ -22,8 +22,8 @@ import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;/*** This class was automatically generated by generateEmojiTokenizationTest.pl. from: <a- * href="http://www.unicode.org/Public/emoji/12.1/emoji-test.txt"><code>- * http://www.unicode.org/Public/emoji/12.1/emoji-test.txt</code></a>+ * href="https://www.unicode.org/Public/emoji/12.1/emoji-test.txt"><code>+ * https://www.unicode.org/Public/emoji/12.1/emoji-test.txt</code></a>*/public final class EmojiTokenizationTestUnicode_12_1 {diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/WordBreakTestUnicode_12_1_0.java b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/WordBreakTestUnicode_12_1_0.javaindex c94c6737a12..47a65dcf8b6 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/WordBreakTestUnicode_12_1_0.java+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/WordBreakTestUnicode_12_1_0.java@@ -36,7 +36,7 @@ import org.apache.lucene.analysis.Analyzer;* http://www.unicode.org/Public/12.1.0/ucd/LineBreak.txt) \p{WordBreak = ALetter} (From* http://www.unicode.org/Public/12.1.0/ucd/auxiliary/WordBreakProperty.txt) \p{WordBreak =* Hebrew_Letter} \p{WordBreak = Katakana} \p{WordBreak = Numeric} \p{Extended_Pictographic} (From- * http://www.unicode.org/Public/emoji/12.1/emoji-data.txt)+ * https://www.unicode.org/Public/emoji/12.1/emoji-data.txt)*/public final class WordBreakTestUnicode_12_1_0 {diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateEmojiTokenizationTest.pl b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateEmojiTokenizationTest.plindex 14409662f97..c581b238289 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateEmojiTokenizationTest.pl+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateEmojiTokenizationTest.pl@@ -30,7 +30,7 @@ unless (GetOptions("version=s" => \$version) && $version =~ /\d+\.\d+/) {if ($version);exit 1;}-my $url = "http://www.unicode.org/Public/emoji/${version}/emoji-test.txt";+my $url = "https://www.unicode.org/Public/emoji/${version}/emoji-test.txt";my $underscore_version = $version;$underscore_version =~ s/\./_/g;my $class_name = "EmojiTokenizationTestUnicode_${underscore_version}";@@ -133,10 +133,11 @@ sub get_URL_content {my $url = shift;print STDERR "Retrieving '$url'...";my $user_agent = LWP::UserAgent->new;+ $user_agent->agent("curl");my $request = HTTP::Request->new(GET => $url);my $response = $user_agent->request($request);unless ($response->is_success) {- print STDERR "Failed to download '$url':\n\t",$response->status_line,"\n";+ print STDERR "Failed to download '$url':\n\t",$response->status_line,$response->content,"\n";exit 1;}print STDERR "done.\n";diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateJavaUnicodeWordBreakTest.pl b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateJavaUnicodeWordBreakTest.plindex 71d8e3586d8..11b33ac86d0 100644--- a/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateJavaUnicodeWordBreakTest.pl+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/analysis/standard/generateJavaUnicodeWordBreakTest.pl@@ -35,7 +35,7 @@ my $scripts_url = "${url_prefix}/Scripts.txt";my $line_break_url = "${url_prefix}/LineBreak.txt";my $word_break_url = "${url_prefix}/auxiliary/WordBreakProperty.txt";my $word_break_test_url = "${url_prefix}/auxiliary/WordBreakTest.txt";-my $emoji_prefix = "http://www.unicode.org/Public/emoji/${version}";+my $emoji_prefix = "https://www.unicode.org/Public/emoji/${version}";my $emoji_url = "${emoji_prefix}/emoji-data.txt";my $underscore_version = "${version}.0";$underscore_version =~ s/\./_/g;@@ -249,6 +249,7 @@ sub get_URL_content {my $url = shift;print STDERR "Retrieving '$url'...";my $user_agent = LWP::UserAgent->new;+ $user_agent->agent("curl");my $request = HTTP::Request->new(GET => $url);my $response = $user_agent->request($request);unless ($response->is_success) {