Skip to content

Commit bfe1998

Browse files
retareta
authored
Update Gradle to 7.6 (#309) (#311)
Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Andriy Redko <[email protected]>
1 parent a395e4f commit bfe1998

File tree

5 files changed

+178
-160
lines changed

5 files changed

+178
-160
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
1616
- Add support to parse sub-aggregations from filter/nested aggregations ([#234](https://github.com/opensearch-project/opensearch-java/pull/234))
1717
- Add timeout and throttle to the jenkins workflows ([#231](https://github.com/opensearch-project/opensearch-java/pull/231))
1818
- Updating maintainers, admins and documentation ([#248](https://github.com/opensearch-project/opensearch-java/pull/248))
19+
- Update Gradle to 7.6 ([#311](https://github.com/opensearch-project/opensearch-java/pull/311))
1920

2021
### Deprecated
2122

‎gradle/wrapper/gradle-wrapper.jar

1.99 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
distributionBase=GRADLE_USER_HOME
3030
distributionPath=wrapper/dists
31-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
31+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3232
zipStoreBase=GRADLE_USER_HOME
3333
zipStorePath=wrapper/dists
34-
distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
34+
distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b

‎gradlew

+164-135
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,7 @@
1-
#!/usr/bin/env sh
1+
#!/bin/sh
22

33
#
4-
# SPDX-License-Identifier: Apache-2.0
5-
#
6-
# The OpenSearch Contributors require contributions made to
7-
# this file be licensed under the Apache-2.0 license or a
8-
# compatible open source license.
9-
#
10-
#
11-
# Licensed to Elasticsearch B.V. under one or more contributor
12-
# license agreements. See the NOTICE file distributed with
13-
# this work for additional information regarding copyright
14-
# ownership. Elasticsearch B.V. licenses this file to you under
15-
# the Apache License, Version 2.0 (the "License"); you may
16-
# not use this file except in compliance with the License.
17-
# You may obtain a copy of the License at
18-
#
19-
# http://www.apache.org/licenses/LICENSE-2.0
20-
#
21-
# Unless required by applicable law or agreed to in writing,
22-
# software distributed under the License is distributed on an
23-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
24-
# KIND, either express or implied. See the License for the
25-
# specific language governing permissions and limitations
26-
# under the License.
27-
#
28-
29-
#
30-
# Copyright 2015 the original author or authors.
4+
# Copyright © 2015-2021 the original authors.
315
#
326
# Licensed under the Apache License, Version 2.0 (the "License");
337
# you may not use this file except in compliance with the License.
@@ -42,72 +16,102 @@
4216
# limitations under the License.
4317
#
4418

45-
# Modifications Copyright OpenSearch Contributors. See
46-
# GitHub history for details.
47-
48-
4919
##############################################################################
50-
##
51-
## Gradle start up script for UN*X
52-
##
20+
#
21+
# Gradle start up script for POSIX generated by Gradle.
22+
#
23+
# Important for running:
24+
#
25+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
26+
# noncompliant, but you have some other compliant shell such as ksh or
27+
# bash, then to run this script, type that shell name before the whole
28+
# command line, like:
29+
#
30+
# ksh Gradle
31+
#
32+
# Busybox and similar reduced shells will NOT work, because this script
33+
# requires all of these POSIX shell features:
34+
# * functions;
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
39+
#
40+
# Important for patching:
41+
#
42+
# (2) This script targets any POSIX shell, so it avoids extensions provided
43+
# by Bash, Ksh, etc; in particular arrays are avoided.
44+
#
45+
# The "traditional" practice of packing multiple parameters into a
46+
# space-separated string is a well documented source of bugs and security
47+
# problems, so this is (mostly) avoided, by progressively accumulating
48+
# options in "$@", and eventually passing that to Java.
49+
#
50+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
51+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
52+
# see the in-line comments for details.
53+
#
54+
# There are tweaks for specific operating systems such as AIX, CygWin,
55+
# Darwin, MinGW, and NonStop.
56+
#
57+
# (3) This script is generated from the Groovy template
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
59+
# within the Gradle project.
60+
#
61+
# You can find Gradle at https://github.com/gradle/gradle/.
62+
#
5363
##############################################################################
5464

5565
# Attempt to set APP_HOME
66+
5667
# Resolve links: $0 may be a link
57-
PRG="$0"
58-
# Need this for relative symlinks.
59-
while [ -h "$PRG" ] ; do
60-
ls=`ls -ld "$PRG"`
61-
link=`expr "$ls" : '.*-> \(.*\)$'`
62-
if expr "$link" : '/.*' > /dev/null; then
63-
PRG="$link"
64-
else
65-
PRG=`dirname "$PRG"`"/$link"
66-
fi
68+
app_path=$0
69+
70+
# Need this for daisy-chained symlinks.
71+
while
72+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
73+
[ -h "$app_path" ]
74+
do
75+
ls=$( ls -ld "$app_path" )
76+
link=${ls#*' -> '}
77+
case $link in #(
78+
/*) app_path=$link ;; #(
79+
*) app_path=$APP_HOME$link ;;
80+
esac
6781
done
68-
SAVED="`pwd`"
69-
cd "`dirname \"$PRG\"`/" >/dev/null
70-
APP_HOME="`pwd -P`"
71-
cd "$SAVED" >/dev/null
7282

73-
APP_NAME="Gradle"
74-
APP_BASE_NAME=`basename "$0"`
83+
# This is normally unused
84+
# shellcheck disable=SC2034
85+
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
7587

7688
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
7789
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
7890

7991
# Use the maximum available, or set MAX_FD != -1 to use that value.
80-
MAX_FD="maximum"
92+
MAX_FD=maximum
8193

8294
warn () {
8395
echo "$*"
84-
}
96+
} >&2
8597

8698
die () {
8799
echo
88100
echo "$*"
89101
echo
90102
exit 1
91-
}
103+
} >&2
92104

93105
# OS specific support (must be 'true' or 'false').
94106
cygwin=false
95107
msys=false
96108
darwin=false
97109
nonstop=false
98-
case "`uname`" in
99-
CYGWIN* )
100-
cygwin=true
101-
;;
102-
Darwin* )
103-
darwin=true
104-
;;
105-
MINGW* )
106-
msys=true
107-
;;
108-
NONSTOP* )
109-
nonstop=true
110-
;;
110+
case "$( uname )" in #(
111+
CYGWIN* ) cygwin=true ;; #(
112+
Darwin* ) darwin=true ;; #(
113+
MSYS* | MINGW* ) msys=true ;; #(
114+
NONSTOP* ) nonstop=true ;;
111115
esac
112116

113117
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -117,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117121
if [ -n "$JAVA_HOME" ] ; then
118122
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
119123
# IBM's JDK on AIX uses strange locations for the executables
120-
JAVACMD="$JAVA_HOME/jre/sh/java"
124+
JAVACMD=$JAVA_HOME/jre/sh/java
121125
else
122-
JAVACMD="$JAVA_HOME/bin/java"
126+
JAVACMD=$JAVA_HOME/bin/java
123127
fi
124128
if [ ! -x "$JAVACMD" ] ; then
125129
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -128,88 +132,113 @@ Please set the JAVA_HOME variable in your environment to match the
128132
location of your Java installation."
129133
fi
130134
else
131-
JAVACMD="java"
135+
JAVACMD=java
132136
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
133137
134138
Please set the JAVA_HOME variable in your environment to match the
135139
location of your Java installation."
136140
fi
137141

138142
# Increase the maximum file descriptors if we can.
139-
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
140-
MAX_FD_LIMIT=`ulimit -H -n`
141-
if [ $? -eq 0 ] ; then
142-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
143-
MAX_FD="$MAX_FD_LIMIT"
144-
fi
145-
ulimit -n $MAX_FD
146-
if [ $? -ne 0 ] ; then
147-
warn "Could not set maximum file descriptor limit: $MAX_FD"
148-
fi
149-
else
150-
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
151-
fi
143+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144+
case $MAX_FD in #(
145+
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
148+
MAX_FD=$( ulimit -H -n ) ||
149+
warn "Could not query maximum file descriptor limit"
150+
esac
151+
case $MAX_FD in #(
152+
'' | soft) :;; #(
153+
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
156+
ulimit -n "$MAX_FD" ||
157+
warn "Could not set maximum file descriptor limit to $MAX_FD"
158+
esac
152159
fi
153160

154-
# For Darwin, add options to specify how the application appears in the dock
155-
if $darwin; then
156-
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
157-
fi
161+
# Collect all arguments for the java command, stacking in reverse order:
162+
# * args from the command line
163+
# * the main class name
164+
# * -classpath
165+
# * -D...appname settings
166+
# * --module-path (only if needed)
167+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
158168

159169
# For Cygwin or MSYS, switch paths to Windows format before running java
160-
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
161-
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
162-
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
163-
164-
JAVACMD=`cygpath --unix "$JAVACMD"`
165-
166-
# We build the pattern for arguments to be converted via cygpath
167-
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
168-
SEP=""
169-
for dir in $ROOTDIRSRAW ; do
170-
ROOTDIRS="$ROOTDIRS$SEP$dir"
171-
SEP="|"
172-
done
173-
OURCYGPATTERN="(^($ROOTDIRS))"
174-
# Add a user-defined pattern to the cygpath arguments
175-
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
176-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
177-
fi
170+
if "$cygwin" || "$msys" ; then
171+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
172+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
173+
174+
JAVACMD=$( cygpath --unix "$JAVACMD" )
175+
178176
# Now convert the arguments - kludge to limit ourselves to /bin/sh
179-
i=0
180-
for arg in "$@" ; do
181-
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
182-
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
183-
184-
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
185-
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
186-
else
187-
eval `echo args$i`="\"$arg\""
177+
for arg do
178+
if
179+
case $arg in #(
180+
-*) false ;; # don't mess with options #(
181+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
182+
[ -e "$t" ] ;; #(
183+
*) false ;;
184+
esac
185+
then
186+
arg=$( cygpath --path --ignore --mixed "$arg" )
188187
fi
189-
i=`expr $i + 1`
188+
# Roll the args list around exactly as many times as the number of
189+
# args, so each arg winds up back in the position where it started, but
190+
# possibly modified.
191+
#
192+
# NB: a `for` loop captures its iteration list before it begins, so
193+
# changing the positional parameters here affects neither the number of
194+
# iterations, nor the values presented in `arg`.
195+
shift # remove old arg
196+
set -- "$@" "$arg" # push replacement arg
190197
done
191-
case $i in
192-
0) set -- ;;
193-
1) set -- "$args0" ;;
194-
2) set -- "$args0" "$args1" ;;
195-
3) set -- "$args0" "$args1" "$args2" ;;
196-
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
197-
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
198-
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
199-
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
200-
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
201-
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
202-
esac
203198
fi
204199

205-
# Escape application args
206-
save () {
207-
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
208-
echo " "
209-
}
210-
APP_ARGS=`save "$@"`
200+
# Collect all arguments for the java command;
201+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202+
# shell script including quotes and variable substitutions, so put them in
203+
# double quotes to make sure that they get re-expanded; and
204+
# * put everything else in single quotes, so that it's not re-expanded.
205+
206+
set -- \
207+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
208+
-classpath "$CLASSPATH" \
209+
org.gradle.wrapper.GradleWrapperMain \
210+
"$@"
211+
212+
# Stop when "xargs" is not available.
213+
if ! command -v xargs >/dev/null 2>&1
214+
then
215+
die "xargs is not available"
216+
fi
217+
218+
# Use "xargs" to parse quoted args.
219+
#
220+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
221+
#
222+
# In Bash we could simply go:
223+
#
224+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
225+
# set -- "${ARGS[@]}" "$@"
226+
#
227+
# but POSIX shell has neither arrays nor command substitution, so instead we
228+
# post-process each arg (as a line of input to sed) to backslash-escape any
229+
# character that might be a shell metacharacter, then use eval to reverse
230+
# that process (while maintaining the separation between arguments), and wrap
231+
# the whole thing up as a single "set" statement.
232+
#
233+
# This will of course break if any of these variables contains a newline or
234+
# an unmatched quote.
235+
#
211236

212-
# Collect all arguments for the java command, following the shell quoting and substitution rules
213-
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
237+
eval "set -- $(
238+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
239+
xargs -n1 |
240+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
241+
tr '\n' ' '
242+
)" '"$@"'
214243

215244
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)