From 1ca497a7fdb4f17bfc7d2ad87e0085a3adfab934 Mon Sep 17 00:00:00 2001
From: Ismael Juma <ismael@juma.me.uk>
Date: Mon, 18 Jan 2021 09:04:20 -0800
Subject: [PATCH] MINOR: Upgrade gradle to 6.8 and test retry plugin to 1.2.0
 (#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 <chia7712@gmail.com>
---
 gradle/dependencies.gradle               | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew                                  | 4 ++--
 wrapper.gradle                           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index b8c7ca64678..94eec1807ac 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -61,7 +61,7 @@ versions += [
   bcpkix: "1.66",
   checkstyle: "8.20",
   commonsCli: "1.4",
-  gradle: "6.7.1",
+  gradle: "6.8",
   gradleVersionsPlugin: "0.36.0",
   grgit: "4.1.0",
   httpclient: "4.5.12",
@@ -115,7 +115,7 @@ versions += [
   spotbugs: "4.1.4",
   spotbugsPlugin: "4.6.0",
   spotlessPlugin: "5.8.2",
-  testRetryPlugin: "1.1.9",
+  testRetryPlugin: "1.2.0",
   zinc: "1.3.5",
   zookeeper: "3.5.8",
   zstd: "1.4.5-12"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1f3fdbc5287..80cf08e74d1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index d38a482c917..a0426ee76ed 100755
--- a/gradlew
+++ b/gradlew
@@ -83,8 +83,8 @@ esac
 
 # Loop in case we encounter an error.
 for attempt in 1 2 3; do
-  if [ ! -e "$APP_HOME"/gradle/wrapper/gradle-wrapper.jar ]; then
-    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
+  if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then
+    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
       rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
       # Pause for a bit before looping in case the server throttled us.
       sleep 5
diff --git a/wrapper.gradle b/wrapper.gradle
index b1b4a3dc54d..2dfca19e74f 100644
--- a/wrapper.gradle
+++ b/wrapper.gradle
@@ -49,7 +49,7 @@ task bootstrapWrapper() {
         def bootstrapString = """
       # Loop in case we encounter an error.
       for attempt in 1 2 3; do
-        if [ ! -e $wrapperJarPath ]; then
+        if [ ! -e "$wrapperJarPath" ]; then
           if ! curl -s -S --retry 3 -L -o "$wrapperJarPath" "$wrapperJarUrl"; then
             rm -f "$wrapperJarPath"
             # Pause for a bit before looping in case the server throttled us.