Apache Lucene open-source search software
Revert "deps(java): bump gradle-wrapper from 9.4.1 to 9.5.0 (#16036)" (#16038)
Dawid Weiss20fd85da779a
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex b8edfba15e0..3dbebcfea65 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.5.0"+minGradle = "9.4.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 01bf52d7082..e52364bd526 100644--- a/gradle/wrapper/gradle-wrapper.jar.sha256+++ b/gradle/wrapper/gradle-wrapper.jar.sha256@@ -1 +1 @@-497c8c2a7e5031f6aa847f88104aa80a93532ec32ee17bdb8d1d2f67a194a9c7 *gradle-wrapper.jar+55243ef57851f12b070ad14f7f5bb8302daceeebc5bce5ece5fa6edb23e1145c *gradle-wrapper.jardiff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex b52fb7e713a..c61a118f7dd 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,9 +1,7 @@distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zipnetworkTimeout=10000-retries=0-retryBackOffMs=500validateDistributionUrl=truezipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/distsdiff --git a/gradlew b/gradlewindex 88520aab1ae..7edc3329c5c 100755--- a/gradlew+++ b/gradlew@@ -1,4 +1,4 @@-#!/bin/sh+#!/usr/bin/env sh## Copyright © 2015 the original authors.diff --git a/gradlew.bat b/gradlew.batindex 68108657805..a12c0d39b59 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -23,8 +23,8 @@@rem@rem ##########################################################################-@rem Set local scope for the variables, and ensure extensions are enabled-setlocal EnableExtensions+@rem Set local scope for the variables with windows NT shell+if "%OS%"=="Windows_NT" setlocalset DIRNAME=%~dp0if "%DIRNAME%"=="" set DIRNAME=.@@ -51,7 +51,7 @@ echo. 1>&2echo Please set the JAVA_HOME variable in your environment to match the 1>&2echo location of your Java installation. 1>&2-"%COMSPEC%" /c exit 1+goto fail:findJavaFromJavaHomeset JAVA_HOME=%JAVA_HOME:"=%@@ -65,7 +65,7 @@ echo. 1>&2echo Please set the JAVA_HOME variable in your environment to match the 1>&2echo location of your Java installation. 1>&2-"%COMSPEC%" /c exit 1+goto fail:execute@rem Setup the command line@@ -93,10 +93,10 @@ for /f "tokens=* delims=" %%H in ('certutil -hashfile "%GRADLE_WRAPPER_JAR%" SHAif /i "%ACTUAL%" NEQ "%EXPECTED%" ("%JAVA_EXE%" -XX:TieredStopAtLevel=1 %JAVA_OPTS% "%APP_HOME%/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "%GRADLE_WRAPPER_JAR%"IF %ERRORLEVEL% EQU 1 goto failWithJvmMessage- IF %ERRORLEVEL% NEQ 0 goto exitWithErrorLevel+ IF %ERRORLEVEL% NEQ 0 goto fail)-@rem Generate gradle.properties if it does not exist+@rem Generate gradle.properties if they don't existIF NOT EXIST "%APP_HOME%\gradle.properties" (@rem local expansion is needed to check ERRORLEVEL inside control blocks.setlocal enableDelayedExpansion@@ -105,18 +105,29 @@ IF NOT EXIST "%APP_HOME%\gradle.properties" (endlocal)+@rem END OF LUCENE CUSTOMIZATION++@rem Execute Gradle+"%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+if %ERRORLEVEL% equ 0 goto mainEnd+goto fail+:failWithJvmMessage@rem https://github.com/apache/lucene/pull/819echo Error: Something went wrong. Make sure you're using the minimum required Java version to compile Lucene.-goto exitWithErrorLevel-@rem END OF LUCENE CUSTOMIZATION+:fail+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of+rem the _cmd.exe /c_ return code!+set EXIT_CODE=%ERRORLEVEL%+if %EXIT_CODE% equ 0 set EXIT_CODE=1+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%+exit /b %EXIT_CODE%-@rem Execute Gradle-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded-@rem which allows us to clear the local environment before executing the java command-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel+:mainEnd+if "%OS%"=="Windows_NT" endlocal-:exitWithErrorLevel-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts-"%COMSPEC%" /c exit %ERRORLEVEL%+:omegadiff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex 331aab15c63..b055ac1277c 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -216,8 +216,6 @@ Buildrecognizes jdk.CPUTimeSample; CodeProfilingPlugin picks gradle/testing/profiling.cputime.jfc orprofiling.jfc by host OS. (Prithvi S)-* GITHUB#16036: Upgrade gradle to 9.5.0 (Dawid Weiss)-Other---------------------diff --git a/lucene/distribution/build.gradle b/lucene/distribution/build.gradleindex 0c076d3e95e..9495078d2ff 100644--- a/lucene/distribution/build.gradle+++ b/lucene/distribution/build.gradle@@ -112,7 +112,7 @@ dependencies {// The third-party JARs consist of all the transitive dependencies from a subset of// all Lucene modules. We only include the demos and Luke. Everything else has to be downloaded// manually or via maven POMs.- for (def module : [+ for (Project module : [project(":lucene:luke"),project(":lucene:demo")]) {