Skip to content

Commit 1ca497a

Browse files
authored
MINOR: Upgrade gradle to 6.8 and test retry plugin to 1.2.0 (apache#9849)
Also fix generation of `gradlew` when `APP_HOME` contains a directory with spaces in its name. Release notes: * https://docs.gradle.org/6.8/release-notes.html * https://github.com/gradle/test-retry-gradle-plugin/releases/tag/v1.2.0 In addition to existing tests, verified that `./gradlewAll jar` succeeds. Reviewers: Chia-Ping Tsai <[email protected]>
1 parent 8648643 commit 1ca497a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

gradle/dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ versions += [
6161
bcpkix: "1.66",
6262
checkstyle: "8.20",
6363
commonsCli: "1.4",
64-
gradle: "6.7.1",
64+
gradle: "6.8",
6565
gradleVersionsPlugin: "0.36.0",
6666
grgit: "4.1.0",
6767
httpclient: "4.5.12",
@@ -115,7 +115,7 @@ versions += [
115115
spotbugs: "4.1.4",
116116
spotbugsPlugin: "4.6.0",
117117
spotlessPlugin: "5.8.2",
118-
testRetryPlugin: "1.1.9",
118+
testRetryPlugin: "1.2.0",
119119
zinc: "1.3.5",
120120
zookeeper: "3.5.8",
121121
zstd: "1.4.5-12"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ esac
8383

8484
# Loop in case we encounter an error.
8585
for attempt in 1 2 3; do
86-
if [ ! -e "$APP_HOME"/gradle/wrapper/gradle-wrapper.jar ]; then
87-
if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v6.7.1/gradle/wrapper/gradle-wrapper.jar"; then
86+
if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then
87+
if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v6.8.0/gradle/wrapper/gradle-wrapper.jar"; then
8888
rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
8989
# Pause for a bit before looping in case the server throttled us.
9090
sleep 5

wrapper.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ task bootstrapWrapper() {
4949
def bootstrapString = """
5050
# Loop in case we encounter an error.
5151
for attempt in 1 2 3; do
52-
if [ ! -e $wrapperJarPath ]; then
52+
if [ ! -e "$wrapperJarPath" ]; then
5353
if ! curl -s -S --retry 3 -L -o "$wrapperJarPath" "$wrapperJarUrl"; then
5454
rm -f "$wrapperJarPath"
5555
# Pause for a bit before looping in case the server throttled us.

0 commit comments

Comments
 (0)