Apache Solr open-source search software
SOLR-16432: Upgrade the gradle wrapper to 7.5.1 (#1074)
Kevin Risden92e09df5c23d
diff --git a/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java b/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.javaindex 8bbcc8d75d3..26f71f17d36 100644--- a/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java+++ b/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java@@ -17,7 +17,11 @@package org.apache.lucene.gradle;import java.io.IOException;+import java.io.InputStream;+import java.io.OutputStream;+import java.net.HttpURLConnection;import java.net.URL;+import java.net.URLConnection;import java.nio.channels.Channels;import java.nio.channels.FileChannel;import java.nio.channels.ReadableByteChannel;@@ -29,6 +33,7 @@ import java.security.MessageDigest;import java.security.NoSuchAlgorithmException;import java.util.EnumSet;import java.util.Locale;+import java.util.concurrent.TimeUnit;import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;import static java.nio.file.StandardOpenOption.APPEND;@@ -79,21 +84,47 @@ public class WrapperDownloader {}}- URL url = new URL("https://github.com/gradle/gradle/raw/v" + wrapperVersion + "/gradle/wrapper/gradle-wrapper.jar");+ URL url = new URL("https://raw.githubusercontent.com/gradle/gradle/v" + wrapperVersion + "/gradle/wrapper/gradle-wrapper.jar");System.err.println("Downloading gradle-wrapper.jar from " + url);- // As of v6.0.1 the wrapper is approximately 60K- // Can increase this if gradle wrapper ever goes beyond 500K, but keep a safety check- final int maxSize = 512 * 1024;-// Zero-copy save the jar to a temp filePath temp = Files.createTempFile(destination.getParent(), ".gradle-wrapper", ".tmp");try {- try (ReadableByteChannel in = Channels.newChannel(url.openStream());- FileChannel out = FileChannel.open(temp, EnumSet.of(APPEND))) {- out.transferFrom(in, 0, maxSize);- } catch (IOException e) {- throw new IOException("Could not download gradle-wrapper.jar (" + e.getMessage() + ").");+ int retries = 3;+ int retryDelay = 30;+ HttpURLConnection connection;+ while (true) {+ connection = (HttpURLConnection) url.openConnection();+ try {+ connection.connect();+ } catch (IOException e) {+ if (retries-- > 0) {+ // Retry after a short delay+ System.err.println("Error connecting to server: " + e + ", will retry in " + retryDelay + " seconds.");+ Thread.sleep(TimeUnit.SECONDS.toMillis(retryDelay));+ continue;+ }+ }++ switch (connection.getResponseCode()) {+ case HttpURLConnection.HTTP_INTERNAL_ERROR:+ case HttpURLConnection.HTTP_UNAVAILABLE:+ case HttpURLConnection.HTTP_BAD_GATEWAY:+ if (retries-- > 0) {+ // Retry after a short delay.+ System.err.println("Server returned HTTP " + connection.getResponseCode() + ", will retry in " + retryDelay + " seconds.");+ Thread.sleep(TimeUnit.SECONDS.toMillis(retryDelay));+ continue;+ }+ }++ // fall through, let getInputStream() throw IOException if there's a failure.+ break;+ }++ try (InputStream is = connection.getInputStream();+ OutputStream out = Files.newOutputStream(temp)){+ is.transferTo(out);}String checksum = checksum(digest, temp);@@ -106,6 +137,9 @@ public class WrapperDownloader {Files.move(temp, destination, REPLACE_EXISTING);temp = null;+ } catch (IOException | InterruptedException e) {+ throw new IOException("Could not download gradle-wrapper.jar (" ++ e.getClass().getSimpleName() + ": " + e.getMessage() + ").");} finally {if (temp != null) {Files.deleteIfExists(temp);diff --git a/gradle/java/folder-layout.gradle b/gradle/java/folder-layout.gradleindex d770ff3921c..b4c5fcf471a 100644--- a/gradle/java/folder-layout.gradle+++ b/gradle/java/folder-layout.gradle@@ -29,7 +29,7 @@ allprojects {from('src/test') {exclude '**/*.java'}- into sourceSets.test.java.outputDir+ into sourceSets.test.java.classesDirectory}processTestResources.dependsOn copyTestResources@@ -49,4 +49,4 @@ allprojects {}}}-}\ No newline at end of file+}diff --git a/gradle/testing/defaults-tests.gradle b/gradle/testing/defaults-tests.gradleindex b39abdb0f45..32044d9a36b 100644--- a/gradle/testing/defaults-tests.gradle+++ b/gradle/testing/defaults-tests.gradle@@ -91,7 +91,7 @@ allprojects {tasks.withType(Test) {ext {- testOutputsDir = file("${reports.junitXml.destination}/outputs")+ testOutputsDir = file("${reports.junitXml.outputLocation}/outputs")}// LUCENE-9660: Make it possible to always rerun tests, even if they're incrementally up-to-date.@@ -149,7 +149,7 @@ allprojects {}// Disable HTML report generation. The reports are big and slow to generate.- reports.html.enabled = false+ reports.html.required = false// Set up logging.testLogging {diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradleindex 044ece428bc..51a2652e98c 100644--- a/gradle/testing/randomization.gradle+++ b/gradle/testing/randomization.gradle@@ -30,7 +30,7 @@ buildscript {}dependencies {- classpath 'com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.2'+ classpath 'com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.9'}}diff --git a/gradle/validation/check-environment.gradle b/gradle/validation/check-environment.gradleindex 7694f8d5d43..3657af23327 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.2'+ expectedGradleVersion = '7.5.1'}wrapper {diff --git a/gradle/validation/ecj-lint.gradle b/gradle/validation/ecj-lint.gradleindex 8c72f9d30f9..f47f70587a1 100644--- a/gradle/validation/ecj-lint.gradle+++ b/gradle/validation/ecj-lint.gradle@@ -52,7 +52,7 @@ allprojects {enabled = !srcDirs.isEmpty()classpath = rootProject.configurations.ecjDeps- main = "org.eclipse.jdt.internal.compiler.batch.Main"+ mainClass = "org.eclipse.jdt.internal.compiler.batch.Main"// Don't emit any .class files.// Hack around "-d none" still emitting package-info.classdiff --git a/gradle/wrapper/gradle-wrapper.jar.sha256 b/gradle/wrapper/gradle-wrapper.jar.sha256index 168e29f1961..df2c115272e 100644--- a/gradle/wrapper/gradle-wrapper.jar.sha256+++ b/gradle/wrapper/gradle-wrapper.jar.sha256@@ -1 +1 @@-33ad4583fd7ee156f533778736fa1b4940bd83b433934d1cc4e9f608e99a6a89+91a239400bb638f36a1795d8fdf7939d532cdc7d794d1119b7261aac158b1e60diff --git a/gradle/wrapper/gradle-wrapper.jar.version b/gradle/wrapper/gradle-wrapper.jar.versionindex 0ee843cc604..a5f017a0a34 100644--- a/gradle/wrapper/gradle-wrapper.jar.version+++ b/gradle/wrapper/gradle-wrapper.jar.version@@ -1 +1 @@-7.2.0+7.5.1diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.propertiesindex a0f7639f7d3..ae04661ee73 100644--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@ -1,5 +1,5 @@distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/dists-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zipzipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/distsdiff --git a/gradlew b/gradlewindex 0ccd1fb609c..39899b765cc 100755--- a/gradlew+++ b/gradlew@@ -1,7 +1,7 @@-#!/usr/bin/env sh+#!/bin/sh#-# Copyright 2015 the original author or authors.+# Copyright © 2015-2021 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.@@ -17,76 +17,113 @@###############################################################################-##-## Gradle start up script for UN*X-##+#+# Gradle start up script for POSIX generated by Gradle.+#+# Important for running:+#+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is+# noncompliant, but you have some other compliant shell such as ksh or+# bash, then to run this script, type that shell name before the whole+# command line, like:+#+# ksh Gradle+#+# Busybox and similar reduced shells will NOT work, because this script+# requires all of these POSIX shell features:+# * functions;+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;+# * compound commands having a testable exit status, especially «case»;+# * various built-in commands including «command», «set», and «ulimit».+#+# Important for patching:+#+# (2) This script targets any POSIX shell, so it avoids extensions provided+# by Bash, Ksh, etc; in particular arrays are avoided.+#+# The "traditional" practice of packing multiple parameters into a+# space-separated string is a well documented source of bugs and security+# problems, so this is (mostly) avoided, by progressively accumulating+# options in "$@", and eventually passing that to Java.+#+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;+# see the in-line comments for details.+#+# There are tweaks for specific operating systems such as AIX, CygWin,+# 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+# within the Gradle project.+#+# You can find Gradle at https://github.com/gradle/gradle/.+################################################################################ Attempt to set APP_HOME+# Resolve links: $0 may be a link-PRG="$0"-# Need this for relative symlinks.-while [ -h "$PRG" ] ; do- ls=`ls -ld "$PRG"`- link=`expr "$ls" : '.*-> \(.*\)$'`- if expr "$link" : '/.*' > /dev/null; then- PRG="$link"- else- PRG=`dirname "$PRG"`"/$link"- fi+app_path=$0++# Need this for daisy-chained symlinks.+while+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path+ [ -h "$app_path" ]+do+ ls=$( ls -ld "$app_path" )+ link=${ls#*' -> '}+ case $link in #(+ /*) app_path=$link ;; #(+ *) app_path=$APP_HOME$link ;;+ esacdone-SAVED="`pwd`"-cd "`dirname \"$PRG\"`/" >/dev/null-APP_HOME="`pwd -P`"-cd "$SAVED" >/dev/null++APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exitAPP_NAME="Gradle"-APP_BASE_NAME=`basename "$0"`+APP_BASE_NAME=${0##*/}# 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"'# Use the maximum available, or set MAX_FD != -1 to use that value.-MAX_FD="maximum"+MAX_FD=maximumwarn () {echo "$*"-}+} >&2die () {echoecho "$*"echoexit 1-}+} >&2# OS specific support (must be 'true' or 'false').cygwin=falsemsys=falsedarwin=falsenonstop=false-case "`uname`" in- CYGWIN* )- cygwin=true- ;;- Darwin* )- darwin=true- ;;- MINGW* )- msys=true- ;;- NONSTOP* )- nonstop=true- ;;+case "$( uname )" in #(+ CYGWIN* ) cygwin=true ;; #(+ Darwin* ) darwin=true ;; #(+ MSYS* | MINGW* ) msys=true ;; #(+ NONSTOP* ) nonstop=true ;;esac+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar++# Determine the Java command to use to start the JVM.if [ -n "$JAVA_HOME" ] ; thenif [ -x "$JAVA_HOME/jre/sh/java" ] ; then# IBM's JDK on AIX uses strange locations for the executables- JAVACMD="$JAVA_HOME/jre/sh/java"+ JAVACMD=$JAVA_HOME/jre/sh/javaelse- JAVACMD="$JAVA_HOME/bin/java"+ JAVACMD=$JAVA_HOME/bin/javafiif [ ! -x "$JAVACMD" ] ; thendie "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME@@ -95,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match thelocation of your Java installation."fielse- JAVACMD="java"+ JAVACMD=javawhich java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.Please set the JAVA_HOME variable in your environment to match the@@ -129,82 +166,96 @@ if [ ! -e "$APP_HOME/gradle.properties" ]; thenfi# Increase the maximum file descriptors if we can.-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then- MAX_FD_LIMIT=`ulimit -H -n`- if [ $? -eq 0 ] ; then- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then- MAX_FD="$MAX_FD_LIMIT"- fi- ulimit -n $MAX_FD- if [ $? -ne 0 ] ; then- warn "Could not set maximum file descriptor limit: $MAX_FD"- fi- else- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"- fi+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then+ case $MAX_FD in #(+ max*)+ MAX_FD=$( ulimit -H -n ) ||+ warn "Could not query maximum file descriptor limit"+ esac+ case $MAX_FD in #(+ '' | soft) :;; #(+ *)+ ulimit -n "$MAX_FD" ||+ warn "Could not set maximum file descriptor limit to $MAX_FD"+ esacfi-# For Darwin, add options to specify how the application appears in the dock-if $darwin; then- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""-fi+# Collect all arguments for the java command, stacking in reverse order:+# * args from the command line+# * the main class name+# * -classpath+# * -D...appname settings+# * --module-path (only if needed)+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.# For Cygwin or MSYS, switch paths to Windows format before running java-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then- JAVACMD=`cygpath --unix "$JAVACMD"`-- # We build the pattern for arguments to be converted via cygpath- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`- SEP=""- for dir in $ROOTDIRSRAW ; do- ROOTDIRS="$ROOTDIRS$SEP$dir"- SEP="|"- done- OURCYGPATTERN="(^($ROOTDIRS))"- # Add a user-defined pattern to the cygpath arguments- if [ "$GRADLE_CYGPATTERN" != "" ] ; then- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"- fi+if "$cygwin" || "$msys" ; then+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )++ JAVACMD=$( cygpath --unix "$JAVACMD" )+# Now convert the arguments - kludge to limit ourselves to /bin/sh- i=0- for arg in "$@" ; do- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option-- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`- else- eval `echo args$i`="\"$arg\""+ for arg do+ if+ case $arg in #(+ -*) false ;; # don't mess with options #(+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath+ [ -e "$t" ] ;; #(+ *) false ;;+ esac+ then+ arg=$( cygpath --path --ignore --mixed "$arg" )fi- i=$((i+1))+ # Roll the args list around exactly as many times as the number of+ # args, so each arg winds up back in the position where it started, but+ # possibly modified.+ #+ # NB: a `for` loop captures its iteration list before it begins, so+ # changing the positional parameters here affects neither the number of+ # iterations, nor the values presented in `arg`.+ shift # remove old arg+ set -- "$@" "$arg" # push replacement argdone- case $i in- (0) set -- ;;- (1) set -- "$args0" ;;- (2) set -- "$args0" "$args1" ;;- (3) set -- "$args0" "$args1" "$args2" ;;- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;- esacfi-# Escape application args-save () {- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done- echo " "-}-APP_ARGS=$(save "$@")+# Collect all arguments for the java command;+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of+# shell script including quotes and variable substitutions, so put them in+# double quotes to make sure that they get re-expanded; and+# * put everything else in single quotes, so that it's not re-expanded.-# Collect all arguments for the java command, following the shell quoting and substitution rules-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain $GRADLE_DAEMON_CTRL "$APP_ARGS"+set -- \+ "-Dorg.gradle.appname=$APP_BASE_NAME" \+ -classpath "$CLASSPATH" \+ org.gradle.wrapper.GradleWrapperMain \+ $GRADLE_DAEMON_CTRL \+ "$@"-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then- cd "$(dirname "$0")"-fi+# Use "xargs" to parse quoted args.+#+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.+#+# In Bash we could simply go:+#+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&+# set -- "${ARGS[@]}" "$@"+#+# but POSIX shell has neither arrays nor command substitution, so instead we+# post-process each arg (as a line of input to sed) to backslash-escape any+# character that might be a shell metacharacter, then use eval to reverse+# that process (while maintaining the separation between arguments), and wrap+# the whole thing up as a single "set" statement.+#+# This will of course break if any of these variables contains a newline or+# an unmatched quote.+#++eval "set -- $(+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |+ xargs -n1 |+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |+ tr '\n' ' '+ )" '"$@"'exec "$JAVACMD" "$@"diff --git a/gradlew.bat b/gradlew.batindex fe7be72c567..3a47fb5373b 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -29,9 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.set APP_BASE_NAME=%~n0set APP_HOME=%DIRNAME%-@rem Resolve any "." and ".." in APP_HOME to make it shorter.-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi-+@rem Resolve any "." and ".." in APP_HOME to make it shorter.+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"@@ -77,7 +77,7 @@ set GRADLE_WRAPPER_JAR=%APP_HOME%\gradle\wrapper\gradle-wrapper.jarIF %ERRORLEVEL% NEQ 0 goto fail@rem Setup the command line-set CLASSPATH=%GRADLE_WRAPPER_JAR%+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar@rem Don't fork a daemon mode on initial run that generates local defaults.SET GRADLE_DAEMON_CTRL=diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 97b32e97f73..49b894739ac 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -64,6 +64,8 @@ Build---------------------* Upgrade forbiddenapis to 3.4 (Uwe Schindler)+* SOLR-16432: Upgrade the gradle wrapper to 7.5.1 (Shawn Heisey, Kevin Risden)+Other Changes---------------------(No changes)diff --git a/solr/prometheus-exporter/build.gradle b/solr/prometheus-exporter/build.gradleindex 613318fa579..980b0256875 100644--- a/solr/prometheus-exporter/build.gradle+++ b/solr/prometheus-exporter/build.gradle@@ -62,7 +62,7 @@ ext {task run(type: JavaExec) {group = 'application'description = 'Run the main class with JavaExecTask'- main = project.ext.mainClass+ mainClass = project.ext.mainClassclasspath = sourceSets.main.runtimeClasspathsystemProperties = ["log4j.configurationFile":"file:conf/log4j2.xml"]args = ["-f", "conf/solr-exporter-config.xml"]