Apache Solr open-source search software
SOLR-16508: Upgrade gradle wrapper to 7.6 (#1147)
Kevin Risden90acc20ef226
diff --git a/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java b/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.javaindex 05d5934636f..a544b6fe735 100644--- a/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java+++ b/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java@@ -61,8 +61,8 @@ public class WrapperDownloader {public static void checkVersion() {int major = Runtime.getRuntime().version().feature();- if (major < 11 || major > 18) {- throw new IllegalStateException("java version must be between 11 and 18, your version: " + major);+ if (major < 11 || major > 19) {+ throw new IllegalStateException("java version must be between 11 and 19, your version: " + major);}}diff --git a/gradle/testing/alternative-jdk-support.gradle b/gradle/testing/alternative-jdk-support.gradleindex d36bd22caee..72cdabdab4b 100644--- a/gradle/testing/alternative-jdk-support.gradle+++ b/gradle/testing/alternative-jdk-support.gradle@@ -3,6 +3,7 @@ import org.gradle.internal.jvm.JavaInfoimport org.gradle.internal.jvm.Jvmimport org.gradle.internal.jvm.inspection.JvmInstallationMetadataimport org.gradle.internal.jvm.inspection.JvmMetadataDetector+import org.gradle.jvm.toolchain.internal.InstallationLocation/** Licensed to the Apache Software Foundation (ASF) under one or more@@ -49,7 +50,7 @@ if (jvmGradle != jvmCurrent) {doFirst {def jvmInfo = { JavaInfo javaInfo ->- JvmInstallationMetadata jvmMetadata = jvmDetector.getMetadata(javaInfo.javaHome)+ JvmInstallationMetadata jvmMetadata = jvmDetector.getMetadata(new InstallationLocation(javaInfo.javaHome, "specific path"))return "${jvmMetadata.languageVersion} (${jvmMetadata.displayName} ${jvmMetadata.runtimeVersion}, home at: ${jvmMetadata.javaHome})"}@@ -86,6 +87,6 @@ if (jvmGradle != jvmCurrent) {// Set up root project's properties.rootProject.ext.runtimeJavaHome = jvmCurrent.javaHome-rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(jvmCurrent.javaHome).languageVersion+rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(new InstallationLocation(jvmCurrent.javaHome, "specific path")).getLanguageVersion()rootProject.ext.usesAltJvm = (jvmGradle != jvmCurrent);diff --git a/gradle/validation/check-environment.gradle b/gradle/validation/check-environment.gradleindex 3657af23327..0fddf093c09 100644--- a/gradle/validation/check-environment.gradle+++ b/gradle/validation/check-environment.gradle@@ -22,7 +22,7 @@ import org.gradle.util.GradleVersionconfigure(rootProject) {ext {- expectedGradleVersion = '7.5.1'+ expectedGradleVersion = '7.6'}wrapper {diff --git a/gradle/wrapper/gradle-wrapper.jar.sha256 b/gradle/wrapper/gradle-wrapper.jar.sha256index df2c115272e..b5168d2a1ff 100644--- a/gradle/wrapper/gradle-wrapper.jar.sha256+++ b/gradle/wrapper/gradle-wrapper.jar.sha256@@ -1 +1 @@-91a239400bb638f36a1795d8fdf7939d532cdc7d794d1119b7261aac158b1e60+c5a643cf80162e665cc228f7b16f343fef868e47d3a4836f62e18b7e17ac018adiff --git a/gradle/wrapper/gradle-wrapper.jar.version b/gradle/wrapper/gradle-wrapper.jar.versionindex a5f017a0a34..93c8ddab9fe 100644--- a/gradle/wrapper/gradle-wrapper.jar.version+++ b/gradle/wrapper/gradle-wrapper.jar.version@@ -1 +1 @@-7.5.1+7.6.0diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex ae04661ee73..f398c33c4b0 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,5 +1,6 @@distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip+networkTimeout=10000zipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/distsdiff --git a/gradlew b/gradlewindex 7cdc46bd717..59dd3f7eb88 100755--- a/gradlew+++ b/gradlew@@ -55,7 +55,7 @@# Darwin, MinGW, and NonStop.## (3) This script is generated from the Groovy template-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt# within the Gradle project.## You can find Gradle at https://github.com/gradle/gradle/.@@ -80,10 +80,10 @@ doesacdone-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit--APP_NAME="Gradle"+# This is normally unused+# shellcheck disable=SC2034APP_BASE_NAME=${0##*/}+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit# 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"'@@ -155,7 +155,7 @@ GRADLE_WRAPPER_JAR="$APP_HOME/gradle/wrapper/gradle-wrapper.jar""$JAVACMD" $JAVA_OPTS --source 11 "$APP_HOME/buildSrc/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 11 - 18."+ echo "ERROR: Something went wrong. Make sure you're using Java 11 - 19."exit $WRAPPER_STATUSelif [ "$WRAPPER_STATUS" -ne 0 ]; thenexit $WRAPPER_STATUS@@ -173,12 +173,16 @@ fiif ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; thencase $MAX_FD in #(max*)+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.+ # shellcheck disable=SC3045MAX_FD=$( ulimit -H -n ) ||warn "Could not query maximum file descriptor limit"esaccase $MAX_FD in #('' | soft) :;; #(*)+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.+ # shellcheck disable=SC3045ulimit -n "$MAX_FD" ||warn "Could not set maximum file descriptor limit to $MAX_FD"esac@@ -236,6 +240,12 @@ set -- \$GRADLE_DAEMON_CTRL \"$@"+# Stop when "xargs" is not available.+if ! command -v xargs >/dev/null 2>&1+then+ die "xargs is not available"+fi+# Use "xargs" to parse quoted args.## With -n1 it outputs one arg per line, with the quotes and backslashes removed.diff --git a/gradlew.bat b/gradlew.batindex 07fb876d09a..964ab6aced2 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -14,7 +14,7 @@@rem limitations under the License.@rem-@if "%DEBUG%" == "" @echo off+@if "%DEBUG%"=="" @echo off@rem ##########################################################################@rem@rem Gradle startup script for Windows@@ -25,7 +25,8 @@if "%OS%"=="Windows_NT" setlocalset DIRNAME=%~dp0-if "%DIRNAME%" == "" set DIRNAME=.+if "%DIRNAME%"=="" set DIRNAME=.+@rem This is normally unusedset APP_BASE_NAME=%~n0set APP_HOME=%DIRNAME%@@ -45,7 +46,7 @@ if defined JAVA_HOME goto findJavaFromJavaHomeset JAVA_EXE=java.exe%JAVA_EXE% -version >NUL 2>&1-if "%ERRORLEVEL%" == "0" goto execute+if %ERRORLEVEL% equ 0 goto executeecho.echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.@@ -88,16 +89,18 @@ IF NOT EXIST "%DIRNAME%\gradle.properties" SET GRADLE_DAEMON_CTRL=--no-daemon:end@rem End local scope for the variables with windows NT shell-if "%ERRORLEVEL%"=="0" goto mainEnd+if %ERRORLEVEL% equ 0 goto mainEnd:fail@rem https://github.com/apache/lucene/pull/819-echo Error: Something went wrong. Make sure you're using Java 11 - 18.+echo Error: Something went wrong. Make sure you're using Java 11 - 19.rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead ofrem the _cmd.exe /c_ return code!-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1-exit /b 1+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%:mainEndif "%OS%"=="Windows_NT" endlocaldiff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex c82d7364c6d..347efa33a06 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -117,6 +117,8 @@ Build* SOLR-16442: Upgrade to Lucene 9.4.1 (Christine Poerschke)+* SOLR-16508: Upgrade gradle wrapper to 7.6 (Kevin Risden)+Other Changes---------------------* SOLR-16545: Upgrade Carrot2 to 4.5.0 (Dawid Weiss)