Apache Lucene open-source search software
Overwrite gradlew scripts with up-to-date ones and apply Lucene customizations. (#14592)
Dawid Weissd66d1523e3cf
diff --git a/gradlew b/gradlewindex b4375f37bd4..d5aef6e04c2 100755--- a/gradlew+++ b/gradlew@@ -1,4 +1,4 @@-#!/usr/bin/env sh+#!/bin/sh## Copyright © 2015-2021 the original authors.@@ -15,6 +15,8 @@# See the License for the specific language governing permissions and# limitations under the License.#+# SPDX-License-Identifier: Apache-2.0+################################################################################@@ -55,7 +57,7 @@# Darwin, MinGW, and NonStop.## (3) This script is generated from the Groovy template-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt# within the Gradle project.## You can find Gradle at https://github.com/gradle/gradle/.@@ -84,7 +86,7 @@ done# shellcheck disable=SC2034APP_BASE_NAME=${0##*/}# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit# Use the maximum available, or set MAX_FD != -1 to use that value.MAX_FD=maximum@@ -112,7 +114,7 @@ case "$( uname )" in #(NONSTOP* ) nonstop=true ;;esac-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar+CLASSPATH="\\\"\\\""# Determine the Java command to use to start the JVM.@@ -140,47 +142,6 @@ location of your Java installation."fifi-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'--# LUCENE-9471: workaround for gradle leaving junk temp. files behind.-GRADLE_TEMPDIR="$APP_HOME/.gradle/tmp"-mkdir -p "$GRADLE_TEMPDIR"-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then- GRADLE_TEMPDIR=`cygpath --path --mixed "$GRADLE_TEMPDIR"`-fi-DEFAULT_JVM_OPTS="$DEFAULT_JVM_OPTS \"-Djava.io.tmpdir=$GRADLE_TEMPDIR\""--# LUCENE-9266: verify and download the gradle wrapper jar if we don't have one.-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then- APP_HOME=`cygpath --path --mixed "$APP_HOME"`-fi--GRADLE_WRAPPER_JAR="$APP_HOME/gradle/wrapper/gradle-wrapper.jar"-if [ ! -e "$GRADLE_WRAPPER_JAR" ]; then- "$JAVACMD" $JAVA_OPTS "$APP_HOME/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "$GRADLE_WRAPPER_JAR"- WRAPPER_STATUS=$?- if [ "$WRAPPER_STATUS" -eq 1 ]; then- echo "ERROR: Something went wrong. Make sure you're using Java version of exactly 23."- exit $WRAPPER_STATUS- elif [ "$WRAPPER_STATUS" -ne 0 ]; then- exit $WRAPPER_STATUS- fi-fi--CLASSPATH=$GRADLE_WRAPPER_JAR--# START OF LUCENE CUSTOMIZATION-# Generate gradle.properties if they don't exist-if [ ! -e "$APP_HOME/gradle.properties" ]; then- "$JAVACMD" $JAVA_OPTS "$APP_HOME/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/GradlePropertiesGenerator.java" "$APP_HOME/gradle/template.gradle.properties" "$APP_HOME/gradle.properties"- GENERATOR_STATUS=$?- if [ "$GENERATOR_STATUS" -ne 0 ]; then- exit $GENERATOR_STATUS- fi-fi-# END OF LUCENE CUSTOMIZATION-# Increase the maximum file descriptors if we can.if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; thencase $MAX_FD in #(@@ -239,11 +200,51 @@ if "$cygwin" || "$msys" ; thendonefi+# START OF LUCENE CUSTOMIZATION++# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'+# Prevent jgit from forking/searching git.exeexport GIT_CONFIG_NOSYSTEM=1+# LUCENE-9471: workaround for gradle leaving junk temp. files behind.+GRADLE_TEMPDIR="$APP_HOME/.gradle/tmp"+mkdir -p "$GRADLE_TEMPDIR"+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then+ GRADLE_TEMPDIR=`cygpath --path --mixed "$GRADLE_TEMPDIR"`+fi+DEFAULT_JVM_OPTS="$DEFAULT_JVM_OPTS \"-Djava.io.tmpdir=$GRADLE_TEMPDIR\""++# LUCENE-9266: verify and download the gradle wrapper jar if we don't have one.+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`+fi++GRADLE_WRAPPER_JAR="$APP_HOME/gradle/wrapper/gradle-wrapper.jar"+if [ ! -e "$GRADLE_WRAPPER_JAR" ]; then+ "$JAVACMD" $JAVA_OPTS "$APP_HOME/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "$GRADLE_WRAPPER_JAR"+ WRAPPER_STATUS=$?+ if [ "$WRAPPER_STATUS" -eq 1 ]; then+ echo "ERROR: Something went wrong. Make sure you're using Java version of exactly 23."+ exit $WRAPPER_STATUS+ elif [ "$WRAPPER_STATUS" -ne 0 ]; then+ exit $WRAPPER_STATUS+ fi+fi++# Generate gradle.properties if they don't exist+if [ ! -e "$APP_HOME/gradle.properties" ]; then+ "$JAVACMD" $JAVA_OPTS "$APP_HOME/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/GradlePropertiesGenerator.java" "$APP_HOME/gradle/template.gradle.properties" "$APP_HOME/gradle.properties"+ GENERATOR_STATUS=$?+ if [ "$GENERATOR_STATUS" -ne 0 ]; then+ exit $GENERATOR_STATUS+ fi+fi+# END OF LUCENE CUSTOMIZATION+# Collect all arguments for the java command:-# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,# and any embedded shellness will be escaped.# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be# treated as '${Hostname}' itself on the command line.@@ -251,7 +252,7 @@ export GIT_CONFIG_NOSYSTEM=1set -- \"-Dorg.gradle.appname=$APP_BASE_NAME" \-classpath "$CLASSPATH" \- org.gradle.wrapper.GradleWrapperMain \+ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \"$@"# Stop when "xargs" is not available.diff --git a/gradlew.bat b/gradlew.batindex d0b5b8c057c..69177e49f98 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -13,6 +13,8 @@@rem See the License for the specific language governing permissions and@rem limitations under the License.@rem+@rem SPDX-License-Identifier: Apache-2.0+@rem@if "%DEBUG%"=="" @echo off@rem ##########################################################################@@ -36,11 +38,6 @@ for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"-@rem LUCENE-9471: workaround for gradle leaving junk temp. files behind.-SET GRADLE_TEMPDIR=%DIRNAME%\.gradle\tmp-IF NOT EXIST "%GRADLE_TEMPDIR%" MKDIR "%GRADLE_TEMPDIR%"-SET DEFAULT_JVM_OPTS=%DEFAULT_JVM_OPTS% "-Djava.io.tmpdir=%GRADLE_TEMPDIR%"-@rem Find java.exeif defined JAVA_HOME goto findJavaFromJavaHome@@ -48,11 +45,11 @@ set JAVA_EXE=java.exe%JAVA_EXE% -version >NUL 2>&1if %ERRORLEVEL% equ 0 goto execute-echo.-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.-echo.-echo Please set the JAVA_HOME variable in your environment to match the-echo location of your Java installation.+echo. 1>&2+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2+echo. 1>&2+echo Please set the JAVA_HOME variable in your environment to match the 1>&2+echo location of your Java installation. 1>&2goto fail@@ -62,17 +59,26 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exeif exist "%JAVA_EXE%" goto execute-echo.-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%-echo.-echo Please set the JAVA_HOME variable in your environment to match the-echo location of your Java installation.+echo. 1>&2+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2+echo. 1>&2+echo Please set the JAVA_HOME variable in your environment to match the 1>&2+echo location of your Java installation. 1>&2goto 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.+SET GRADLE_TEMPDIR=%DIRNAME%\.gradle\tmp+IF NOT EXIST "%GRADLE_TEMPDIR%" MKDIR "%GRADLE_TEMPDIR%"+SET DEFAULT_JVM_OPTS=%DEFAULT_JVM_OPTS% "-Djava.io.tmpdir=%GRADLE_TEMPDIR%"+@rem LUCENE-9266: verify and download the gradle wrapper jar if we don't have one.set GRADLE_WRAPPER_JAR=%APP_HOME%\gradle\wrapper\gradle-wrapper.jarIF NOT EXIST "%GRADLE_WRAPPER_JAR%" (@@ -81,10 +87,6 @@ IF NOT EXIST "%GRADLE_WRAPPER_JAR%" (IF %ERRORLEVEL% NEQ 0 goto fail)-@rem Setup the command line-set CLASSPATH=%GRADLE_WRAPPER_JAR%--@rem START OF LUCENE CUSTOMIZATION@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.@@ -93,13 +95,14 @@ IF NOT EXIST "%APP_HOME%\gradle.properties" (IF %ERRORLEVEL% NEQ 0 goto failendlocal)-@rem END OF LUCENE CUSTOMIZATION@rem Prevent jgit from forking/searching git.exeSET GIT_CONFIG_NOSYSTEM=1+@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%" org.gradle.wrapper.GradleWrapperMain %*+"%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" %*:end@rem End local scope for the variables with windows NT shell@@ -108,7 +111,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 23.+echo Error: Something went wrong. Make sure you're using Java version of exactly 24.:failrem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of