[High Priority] Excavator: Update gradle-jdks infrastructure plugins (#485)

Author: svc-excavator-bot

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.1.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.55.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.56.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0'
     }
 }

gradle/gradle-jdks-functions.sh

@@ -25,14 +25,17 @@ fi
 TMP_WORK_DIR=$(mktemp -d)
 export TMP_WORK_DIR
 
+# writing to stderr
+write() { echo "$*" >&2; }
+
 cleanup() {
   [ -d "$TMP_WORK_DIR" ] && rm -rf "$TMP_WORK_DIR"
 }
 
 die() {
-    echo
-    echo "$*"
-    echo
+    write
+    write "$*"
+    write
     cleanup
     exit 1
 } >&2
@@ -115,17 +118,17 @@ install_and_setup_jdks() {
     major_version_dir=${dir%*/}
     major_version=${major_version_dir##*/}
     if [ "$major_version" = "8" ]; then
-      echo "Skipping JDK 8 installation as it is not supported by Gradle JDKs Setup."
+      write "Skipping JDK 8 installation as it is not supported by Gradle JDKs Setup."
       continue
     fi
     distribution_local_path=$(read_value "$major_version_dir"/"$OS"/"$ARCH"/local-path)
     distribution_url=$(read_value "$major_version_dir"/"$OS"/"$ARCH"/download-url)
     # Check if distribution exists in $GRADLE_JDKS_HOME
     jdk_installation_directory="$GRADLE_JDKS_HOME"/"$distribution_local_path"
     if [ ! -d "$jdk_installation_directory" ]; then
-      echo "JDK installation '$jdk_installation_directory' does not exist, installing '$distribution_url' in progress ..."
+      write "JDK installation '$jdk_installation_directory' does not exist, installing '$distribution_url' in progress ..."
     elif [ ! -f "$jdk_installation_directory/bin/java" ]; then
-      echo "Java executable not found in $jdk_installation_directory/bin/java, re-installing the JDK...."
+      write "Java executable not found in $jdk_installation_directory/bin/java, re-installing the JDK...."
     else
       continue
     fi
@@ -134,19 +137,19 @@ install_and_setup_jdks() {
     mkdir -p "$in_progress_dir"
     cd "$in_progress_dir" || die "failed to change dir to $in_progress_dir"
     if command -v curl > /dev/null 2>&1; then
-      echo "Using curl to download $distribution_url"
+      write "Using curl to download $distribution_url"
       case "$distribution_url" in
         *.zip)
           distribution_name=${distribution_url##*/}
           curl -C - "$distribution_url" -o "$distribution_name"
           tar -xzf "$distribution_name"
           ;;
         *)
-          curl -k -C - "$distribution_url" | tar -xzf -
+          curl -C - "$distribution_url" | tar -xzf -
           ;;
       esac
     elif command -v wget > /dev/null 2>&1; then
-      echo "Using wget to download $distribution_url"
+      write "Using wget to download $distribution_url"
       case "$distribution_url" in
         *.zip)
           distribution_name=${distribution_url##*/}
@@ -160,11 +163,11 @@ install_and_setup_jdks() {
     else
       die "ERROR: Neither curl nor wget are installed, Could not set up JAVA_HOME"
     fi
-    cd - || exit
+    cd - > /dev/null || die "failed to change dir to old pwd: $OLDPWD"
 
     # Finding the java_home
     java_home=$(get_java_home "$in_progress_dir")
     "$java_home"/bin/java -cp "$scripts_dir"/gradle-jdks-setup.jar com.palantir.gradle.jdks.setup.GradleJdkInstallationSetup jdkSetup "$jdk_installation_directory" || die "Failed to set up JDK $jdk_installation_directory"
-    echo "Successfully installed JDK distribution in $jdk_installation_directory"
+    write "Successfully installed JDK distribution in $jdk_installation_directory"
   done
 }

gradle/gradle-jdks-setup.jar

@@ -65,7 +65,7 @@
 # !! Contents within this block are managed by 'palantir/gradle-jdks' !!
 if [ -f gradle/gradle-jdks-setup.sh ]; then
     if ! . gradle/gradle-jdks-setup.sh; then
-        echo "Failed to set up JDK, running gradle/gradle-jdks-setup.sh failed with non-zero exit code"
+        echo "Failed to set up JDK, running gradle/gradle-jdks-setup.sh failed with non-zero exit code" >&2
         exit 1
     fi
     # Setting JAVA_HOME to the gradle daemon to make sure gradlew uses this jdk for `JAVACMD`

gradlew

@@ -4,7 +4,7 @@ buildscript {
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
     }
     dependencies {
-        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.55.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.56.0'
     }
 }
 apply plugin: 'com.palantir.jdks.settings'