From 8fb73781c6ec0e43710bda94c5fe7bbb95e5c2dc Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Mon, 4 Nov 2024 19:01:28 +0000 Subject: [PATCH] Excavator: Update gradle-jdks infrastructure plugins --- build.gradle | 4 +- gradle/gradle-jdks-functions.sh | 79 ++++++++++-------- gradle/gradle-jdks-setup.jar | Bin 111518 -> 111980 bytes gradle/gradle-jdks-setup.sh | 3 +- .../jdks/11/linux-glibc/aarch64/download-url | 2 +- gradle/jdks/11/linux-glibc/aarch64/local-path | 2 +- .../jdks/11/linux-glibc/x86-64/download-url | 2 +- gradle/jdks/11/linux-glibc/x86-64/local-path | 2 +- gradle/jdks/11/linux-glibc/x86/download-url | 2 +- gradle/jdks/11/linux-glibc/x86/local-path | 2 +- .../jdks/11/linux-musl/aarch64/download-url | 2 +- gradle/jdks/11/linux-musl/aarch64/local-path | 2 +- gradle/jdks/11/linux-musl/x86-64/download-url | 2 +- gradle/jdks/11/linux-musl/x86-64/local-path | 2 +- gradle/jdks/11/macos/aarch64/download-url | 2 +- gradle/jdks/11/macos/aarch64/local-path | 2 +- gradle/jdks/11/macos/x86-64/download-url | 2 +- gradle/jdks/11/macos/x86-64/local-path | 2 +- gradle/jdks/11/windows/x86-64/download-url | 2 +- gradle/jdks/11/windows/x86-64/local-path | 2 +- gradle/jdks/11/windows/x86/download-url | 2 +- gradle/jdks/11/windows/x86/local-path | 2 +- .../jdks/17/linux-glibc/aarch64/download-url | 2 +- gradle/jdks/17/linux-glibc/aarch64/local-path | 2 +- .../jdks/17/linux-glibc/x86-64/download-url | 2 +- gradle/jdks/17/linux-glibc/x86-64/local-path | 2 +- .../jdks/17/linux-musl/aarch64/download-url | 2 +- gradle/jdks/17/linux-musl/aarch64/local-path | 2 +- gradle/jdks/17/linux-musl/x86-64/download-url | 2 +- gradle/jdks/17/linux-musl/x86-64/local-path | 2 +- gradle/jdks/17/macos/aarch64/download-url | 2 +- gradle/jdks/17/macos/aarch64/local-path | 2 +- gradle/jdks/17/macos/x86-64/download-url | 2 +- gradle/jdks/17/macos/x86-64/local-path | 2 +- gradle/jdks/17/windows/x86-64/download-url | 2 +- gradle/jdks/17/windows/x86-64/local-path | 2 +- .../jdks/21/linux-glibc/aarch64/download-url | 2 +- gradle/jdks/21/linux-glibc/aarch64/local-path | 2 +- .../jdks/21/linux-glibc/x86-64/download-url | 2 +- gradle/jdks/21/linux-glibc/x86-64/local-path | 2 +- .../jdks/21/linux-musl/aarch64/download-url | 2 +- gradle/jdks/21/linux-musl/aarch64/local-path | 2 +- gradle/jdks/21/linux-musl/x86-64/download-url | 2 +- gradle/jdks/21/linux-musl/x86-64/local-path | 2 +- gradle/jdks/21/macos/aarch64/download-url | 2 +- gradle/jdks/21/macos/aarch64/local-path | 2 +- gradle/jdks/21/macos/x86-64/download-url | 2 +- gradle/jdks/21/macos/x86-64/local-path | 2 +- gradle/jdks/21/windows/x86-64/download-url | 2 +- gradle/jdks/21/windows/x86-64/local-path | 2 +- gradlew | 2 + settings.gradle | 2 +- 52 files changed, 95 insertions(+), 87 deletions(-) diff --git a/build.gradle b/build.gradle index f1ede302156..8904c907ba1 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ buildscript { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.18.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.48.0' - classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.15.0' + classpath 'com.palantir.gradle.jdks:gradle-jdks:0.54.0' + classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.50.0' classpath 'com.palantir.metricschema:gradle-metric-schema:0.32.0' classpath 'com.palantir.sls-packaging:gradle-sls-packaging:7.13.0' diff --git a/gradle/gradle-jdks-functions.sh b/gradle/gradle-jdks-functions.sh index 49eb3d1067f..cd643893a5f 100755 --- a/gradle/gradle-jdks-functions.sh +++ b/gradle/gradle-jdks-functions.sh @@ -123,44 +123,49 @@ install_and_setup_jdks() { # Check if distribution exists in $GRADLE_JDKS_HOME jdk_installation_directory="$GRADLE_JDKS_HOME"/"$distribution_local_path" if [ ! -d "$jdk_installation_directory" ]; then - # Download and extract the distribution into a temporary directory echo "JDK installation '$jdk_installation_directory' does not exist, installing '$distribution_url' in progress ..." - in_progress_dir="$TMP_WORK_DIR/$distribution_local_path.in-progress" - 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" - case "$distribution_url" in - *.zip) - distribution_name=${distribution_url##*/} - curl -C - "$distribution_url" -o "$distribution_name" - tar -xzf "$distribution_name" - ;; - *) - curl -C - "$distribution_url" | tar -xzf - - ;; - esac - elif command -v wget > /dev/null 2>&1; then - echo "Using wget to download $distribution_url" - case "$distribution_url" in - *.zip) - distribution_name=${distribution_url##*/} - wget -c "$distribution_url" -O "$distribution_name" - tar -xzf "$distribution_name" - ;; - *) - wget -qO- -c "$distribution_url" | tar -xzf - - ;; - esac - else - die "ERROR: Neither curl nor wget are installed, Could not set up JAVA_HOME" - fi - cd - || exit - - # 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" + elif [ ! -f "$jdk_installation_directory/bin/java" ]; then + echo "Java executable not found in $jdk_installation_directory/bin/java, re-installing the JDK...." + else + echo "JDK installation $jdk_installation_directory was already configured" + continue + fi + # Download and extract the distribution into a temporary directory + in_progress_dir="$TMP_WORK_DIR/$distribution_local_path.in-progress" + 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" + 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 - + ;; + esac + elif command -v wget > /dev/null 2>&1; then + echo "Using wget to download $distribution_url" + case "$distribution_url" in + *.zip) + distribution_name=${distribution_url##*/} + wget -c "$distribution_url" -O "$distribution_name" + tar -xzf "$distribution_name" + ;; + *) + wget -qO- -c "$distribution_url" | tar -xzf - + ;; + esac + else + die "ERROR: Neither curl nor wget are installed, Could not set up JAVA_HOME" fi + cd - || exit + + # 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" done } diff --git a/gradle/gradle-jdks-setup.jar b/gradle/gradle-jdks-setup.jar index 6f3e775a6c5a966fd76d0195c0deca7b091c0cce..47180284738c0e37fe92959909150b9af32c75e5 100644 GIT binary patch delta 13303 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 X{U7>KaAX+Ny$(c=92Nzv4&46(FjT%( delta 12753 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 diff --git a/gradle/gradle-jdks-setup.sh b/gradle/gradle-jdks-setup.sh index f8cd657820e..fe7d9122171 100755 --- a/gradle/gradle-jdks-setup.sh +++ b/gradle/gradle-jdks-setup.sh @@ -74,6 +74,7 @@ gradle_daemon_jdk_distribution_local_path=$(read_value "$APP_GRADLE_DIR"/jdks/"$ "$GRADLE_JDKS_HOME"/"$gradle_daemon_jdk_distribution_local_path"/bin/java -cp "$APP_GRADLE_DIR"/gradle-jdks-setup.jar com.palantir.gradle.jdks.setup.GradleJdkInstallationSetup daemonSetup "$APP_HOME" "$GRADLE_JDKS_HOME/$gradle_daemon_jdk_distribution_local_path" # [Used by ./gradlew only] Setting the Gradle Daemon Java Home to the JDK distribution -set -- "-Dorg.gradle.java.home=$GRADLE_JDKS_HOME/$gradle_daemon_jdk_distribution_local_path" "$@" +export GRADLE_DAEMON_JDK="$GRADLE_JDKS_HOME/$gradle_daemon_jdk_distribution_local_path" +set -- "-Dorg.gradle.java.home=$GRADLE_DAEMON_JDK" "$@" cleanup diff --git a/gradle/jdks/11/linux-glibc/aarch64/download-url b/gradle/jdks/11/linux-glibc/aarch64/download-url index b6229d7e941..1c27d849adc 100644 --- a/gradle/jdks/11/linux-glibc/aarch64/download-url +++ b/gradle/jdks/11/linux-glibc/aarch64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-linux-aarch64.tar.gz +https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-linux-aarch64.tar.gz diff --git a/gradle/jdks/11/linux-glibc/aarch64/local-path b/gradle/jdks/11/linux-glibc/aarch64/local-path index 664fc73f967..0d759e87e7b 100644 --- a/gradle/jdks/11/linux-glibc/aarch64/local-path +++ b/gradle/jdks/11/linux-glibc/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.24.8.1 +amazon-corretto-11.0.25.9.1 diff --git a/gradle/jdks/11/linux-glibc/x86-64/download-url b/gradle/jdks/11/linux-glibc/x86-64/download-url index aa310f036d1..d540634a604 100644 --- a/gradle/jdks/11/linux-glibc/x86-64/download-url +++ b/gradle/jdks/11/linux-glibc/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-linux-x64.tar.gz +https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-linux-x64.tar.gz diff --git a/gradle/jdks/11/linux-glibc/x86-64/local-path b/gradle/jdks/11/linux-glibc/x86-64/local-path index 664fc73f967..0d759e87e7b 100644 --- a/gradle/jdks/11/linux-glibc/x86-64/local-path +++ b/gradle/jdks/11/linux-glibc/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.24.8.1 +amazon-corretto-11.0.25.9.1 diff --git a/gradle/jdks/11/linux-glibc/x86/download-url b/gradle/jdks/11/linux-glibc/x86/download-url index d504a5eb8fa..49a678042d6 100644 --- a/gradle/jdks/11/linux-glibc/x86/download-url +++ b/gradle/jdks/11/linux-glibc/x86/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-linux-i386.tar.gz +https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-linux-i386.tar.gz diff --git a/gradle/jdks/11/linux-glibc/x86/local-path b/gradle/jdks/11/linux-glibc/x86/local-path index 664fc73f967..0d759e87e7b 100644 --- a/gradle/jdks/11/linux-glibc/x86/local-path +++ b/gradle/jdks/11/linux-glibc/x86/local-path @@ -1 +1 @@ -amazon-corretto-11.0.24.8.1 +amazon-corretto-11.0.25.9.1 diff --git a/gradle/jdks/11/linux-musl/aarch64/download-url b/gradle/jdks/11/linux-musl/aarch64/download-url index 65ddd140088..53c13116516 100644 --- a/gradle/jdks/11/linux-musl/aarch64/download-url +++ b/gradle/jdks/11/linux-musl/aarch64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-alpine-linux-aarch64.tar.gz +https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-alpine-linux-aarch64.tar.gz diff --git a/gradle/jdks/11/linux-musl/aarch64/local-path b/gradle/jdks/11/linux-musl/aarch64/local-path index 664fc73f967..0d759e87e7b 100644 --- a/gradle/jdks/11/linux-musl/aarch64/local-path +++ b/gradle/jdks/11/linux-musl/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.24.8.1 +amazon-corretto-11.0.25.9.1 diff --git a/gradle/jdks/11/linux-musl/x86-64/download-url b/gradle/jdks/11/linux-musl/x86-64/download-url index 3ccb9056216..e6c67cf1a81 100644 --- a/gradle/jdks/11/linux-musl/x86-64/download-url +++ b/gradle/jdks/11/linux-musl/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-alpine-linux-x64.tar.gz +https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-alpine-linux-x64.tar.gz diff --git a/gradle/jdks/11/linux-musl/x86-64/local-path b/gradle/jdks/11/linux-musl/x86-64/local-path index 664fc73f967..0d759e87e7b 100644 --- a/gradle/jdks/11/linux-musl/x86-64/local-path +++ b/gradle/jdks/11/linux-musl/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.24.8.1 +amazon-corretto-11.0.25.9.1 diff --git a/gradle/jdks/11/macos/aarch64/download-url b/gradle/jdks/11/macos/aarch64/download-url index b1f3be55936..0bcc8e79aab 100644 --- a/gradle/jdks/11/macos/aarch64/download-url +++ b/gradle/jdks/11/macos/aarch64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-macosx-aarch64.tar.gz +https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-macosx-aarch64.tar.gz diff --git a/gradle/jdks/11/macos/aarch64/local-path b/gradle/jdks/11/macos/aarch64/local-path index 664fc73f967..0d759e87e7b 100644 --- a/gradle/jdks/11/macos/aarch64/local-path +++ b/gradle/jdks/11/macos/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.24.8.1 +amazon-corretto-11.0.25.9.1 diff --git a/gradle/jdks/11/macos/x86-64/download-url b/gradle/jdks/11/macos/x86-64/download-url index 69bbff5febe..0af3ae7e06c 100644 --- a/gradle/jdks/11/macos/x86-64/download-url +++ b/gradle/jdks/11/macos/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-macosx-x64.tar.gz +https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-macosx-x64.tar.gz diff --git a/gradle/jdks/11/macos/x86-64/local-path b/gradle/jdks/11/macos/x86-64/local-path index 664fc73f967..0d759e87e7b 100644 --- a/gradle/jdks/11/macos/x86-64/local-path +++ b/gradle/jdks/11/macos/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.24.8.1 +amazon-corretto-11.0.25.9.1 diff --git a/gradle/jdks/11/windows/x86-64/download-url b/gradle/jdks/11/windows/x86-64/download-url index 280a48946c3..e497899f830 100644 --- a/gradle/jdks/11/windows/x86-64/download-url +++ b/gradle/jdks/11/windows/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-windows-x64-jdk.zip +https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-windows-x64-jdk.zip diff --git a/gradle/jdks/11/windows/x86-64/local-path b/gradle/jdks/11/windows/x86-64/local-path index 664fc73f967..0d759e87e7b 100644 --- a/gradle/jdks/11/windows/x86-64/local-path +++ b/gradle/jdks/11/windows/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-11.0.24.8.1 +amazon-corretto-11.0.25.9.1 diff --git a/gradle/jdks/11/windows/x86/download-url b/gradle/jdks/11/windows/x86/download-url index cdb4c2f9bcb..60270dbc617 100644 --- a/gradle/jdks/11/windows/x86/download-url +++ b/gradle/jdks/11/windows/x86/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-windows-i386-jdk.zip +https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-windows-i386-jdk.zip diff --git a/gradle/jdks/11/windows/x86/local-path b/gradle/jdks/11/windows/x86/local-path index 664fc73f967..0d759e87e7b 100644 --- a/gradle/jdks/11/windows/x86/local-path +++ b/gradle/jdks/11/windows/x86/local-path @@ -1 +1 @@ -amazon-corretto-11.0.24.8.1 +amazon-corretto-11.0.25.9.1 diff --git a/gradle/jdks/17/linux-glibc/aarch64/download-url b/gradle/jdks/17/linux-glibc/aarch64/download-url index d4343579a15..e8041c074cc 100644 --- a/gradle/jdks/17/linux-glibc/aarch64/download-url +++ b/gradle/jdks/17/linux-glibc/aarch64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-linux-aarch64.tar.gz +https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-linux-aarch64.tar.gz diff --git a/gradle/jdks/17/linux-glibc/aarch64/local-path b/gradle/jdks/17/linux-glibc/aarch64/local-path index b55ee1d37f9..edac2a827af 100644 --- a/gradle/jdks/17/linux-glibc/aarch64/local-path +++ b/gradle/jdks/17/linux-glibc/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.12.7.1 +amazon-corretto-17.0.13.11.1 diff --git a/gradle/jdks/17/linux-glibc/x86-64/download-url b/gradle/jdks/17/linux-glibc/x86-64/download-url index f321979d0f9..5de2c8bb097 100644 --- a/gradle/jdks/17/linux-glibc/x86-64/download-url +++ b/gradle/jdks/17/linux-glibc/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-linux-x64.tar.gz +https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-linux-x64.tar.gz diff --git a/gradle/jdks/17/linux-glibc/x86-64/local-path b/gradle/jdks/17/linux-glibc/x86-64/local-path index b55ee1d37f9..edac2a827af 100644 --- a/gradle/jdks/17/linux-glibc/x86-64/local-path +++ b/gradle/jdks/17/linux-glibc/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.12.7.1 +amazon-corretto-17.0.13.11.1 diff --git a/gradle/jdks/17/linux-musl/aarch64/download-url b/gradle/jdks/17/linux-musl/aarch64/download-url index ef000db4bbc..17747719be3 100644 --- a/gradle/jdks/17/linux-musl/aarch64/download-url +++ b/gradle/jdks/17/linux-musl/aarch64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-alpine-linux-aarch64.tar.gz +https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-alpine-linux-aarch64.tar.gz diff --git a/gradle/jdks/17/linux-musl/aarch64/local-path b/gradle/jdks/17/linux-musl/aarch64/local-path index b55ee1d37f9..edac2a827af 100644 --- a/gradle/jdks/17/linux-musl/aarch64/local-path +++ b/gradle/jdks/17/linux-musl/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.12.7.1 +amazon-corretto-17.0.13.11.1 diff --git a/gradle/jdks/17/linux-musl/x86-64/download-url b/gradle/jdks/17/linux-musl/x86-64/download-url index 65cf11f0b3d..8bc6ab5e4bf 100644 --- a/gradle/jdks/17/linux-musl/x86-64/download-url +++ b/gradle/jdks/17/linux-musl/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-alpine-linux-x64.tar.gz +https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-alpine-linux-x64.tar.gz diff --git a/gradle/jdks/17/linux-musl/x86-64/local-path b/gradle/jdks/17/linux-musl/x86-64/local-path index b55ee1d37f9..edac2a827af 100644 --- a/gradle/jdks/17/linux-musl/x86-64/local-path +++ b/gradle/jdks/17/linux-musl/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.12.7.1 +amazon-corretto-17.0.13.11.1 diff --git a/gradle/jdks/17/macos/aarch64/download-url b/gradle/jdks/17/macos/aarch64/download-url index a9610398f3b..6da4b67807e 100644 --- a/gradle/jdks/17/macos/aarch64/download-url +++ b/gradle/jdks/17/macos/aarch64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-macosx-aarch64.tar.gz +https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-macosx-aarch64.tar.gz diff --git a/gradle/jdks/17/macos/aarch64/local-path b/gradle/jdks/17/macos/aarch64/local-path index b55ee1d37f9..edac2a827af 100644 --- a/gradle/jdks/17/macos/aarch64/local-path +++ b/gradle/jdks/17/macos/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.12.7.1 +amazon-corretto-17.0.13.11.1 diff --git a/gradle/jdks/17/macos/x86-64/download-url b/gradle/jdks/17/macos/x86-64/download-url index a083a304634..2f5b0570472 100644 --- a/gradle/jdks/17/macos/x86-64/download-url +++ b/gradle/jdks/17/macos/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-macosx-x64.tar.gz +https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-macosx-x64.tar.gz diff --git a/gradle/jdks/17/macos/x86-64/local-path b/gradle/jdks/17/macos/x86-64/local-path index b55ee1d37f9..edac2a827af 100644 --- a/gradle/jdks/17/macos/x86-64/local-path +++ b/gradle/jdks/17/macos/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.12.7.1 +amazon-corretto-17.0.13.11.1 diff --git a/gradle/jdks/17/windows/x86-64/download-url b/gradle/jdks/17/windows/x86-64/download-url index 8f22f957653..bc0df773160 100644 --- a/gradle/jdks/17/windows/x86-64/download-url +++ b/gradle/jdks/17/windows/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-windows-x64-jdk.zip +https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-windows-x64-jdk.zip diff --git a/gradle/jdks/17/windows/x86-64/local-path b/gradle/jdks/17/windows/x86-64/local-path index b55ee1d37f9..edac2a827af 100644 --- a/gradle/jdks/17/windows/x86-64/local-path +++ b/gradle/jdks/17/windows/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-17.0.12.7.1 +amazon-corretto-17.0.13.11.1 diff --git a/gradle/jdks/21/linux-glibc/aarch64/download-url b/gradle/jdks/21/linux-glibc/aarch64/download-url index ab51f6db37a..4310614160a 100644 --- a/gradle/jdks/21/linux-glibc/aarch64/download-url +++ b/gradle/jdks/21/linux-glibc/aarch64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-linux-aarch64.tar.gz +https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-linux-aarch64.tar.gz diff --git a/gradle/jdks/21/linux-glibc/aarch64/local-path b/gradle/jdks/21/linux-glibc/aarch64/local-path index 7865953940d..4c19e3acf98 100644 --- a/gradle/jdks/21/linux-glibc/aarch64/local-path +++ b/gradle/jdks/21/linux-glibc/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.4.7.1 +amazon-corretto-21.0.5.11.1 diff --git a/gradle/jdks/21/linux-glibc/x86-64/download-url b/gradle/jdks/21/linux-glibc/x86-64/download-url index 214ea712191..25c31a53879 100644 --- a/gradle/jdks/21/linux-glibc/x86-64/download-url +++ b/gradle/jdks/21/linux-glibc/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-linux-x64.tar.gz +https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-linux-x64.tar.gz diff --git a/gradle/jdks/21/linux-glibc/x86-64/local-path b/gradle/jdks/21/linux-glibc/x86-64/local-path index 7865953940d..4c19e3acf98 100644 --- a/gradle/jdks/21/linux-glibc/x86-64/local-path +++ b/gradle/jdks/21/linux-glibc/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.4.7.1 +amazon-corretto-21.0.5.11.1 diff --git a/gradle/jdks/21/linux-musl/aarch64/download-url b/gradle/jdks/21/linux-musl/aarch64/download-url index 0eb5091b358..90d966e8a9b 100644 --- a/gradle/jdks/21/linux-musl/aarch64/download-url +++ b/gradle/jdks/21/linux-musl/aarch64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-alpine-linux-aarch64.tar.gz +https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-alpine-linux-aarch64.tar.gz diff --git a/gradle/jdks/21/linux-musl/aarch64/local-path b/gradle/jdks/21/linux-musl/aarch64/local-path index 7865953940d..4c19e3acf98 100644 --- a/gradle/jdks/21/linux-musl/aarch64/local-path +++ b/gradle/jdks/21/linux-musl/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.4.7.1 +amazon-corretto-21.0.5.11.1 diff --git a/gradle/jdks/21/linux-musl/x86-64/download-url b/gradle/jdks/21/linux-musl/x86-64/download-url index 421fdc33f8b..a507d2cd45f 100644 --- a/gradle/jdks/21/linux-musl/x86-64/download-url +++ b/gradle/jdks/21/linux-musl/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-alpine-linux-x64.tar.gz +https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-alpine-linux-x64.tar.gz diff --git a/gradle/jdks/21/linux-musl/x86-64/local-path b/gradle/jdks/21/linux-musl/x86-64/local-path index 7865953940d..4c19e3acf98 100644 --- a/gradle/jdks/21/linux-musl/x86-64/local-path +++ b/gradle/jdks/21/linux-musl/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.4.7.1 +amazon-corretto-21.0.5.11.1 diff --git a/gradle/jdks/21/macos/aarch64/download-url b/gradle/jdks/21/macos/aarch64/download-url index 03a669f5a09..2ab7620eb20 100644 --- a/gradle/jdks/21/macos/aarch64/download-url +++ b/gradle/jdks/21/macos/aarch64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-macosx-aarch64.tar.gz +https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-macosx-aarch64.tar.gz diff --git a/gradle/jdks/21/macos/aarch64/local-path b/gradle/jdks/21/macos/aarch64/local-path index 7865953940d..4c19e3acf98 100644 --- a/gradle/jdks/21/macos/aarch64/local-path +++ b/gradle/jdks/21/macos/aarch64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.4.7.1 +amazon-corretto-21.0.5.11.1 diff --git a/gradle/jdks/21/macos/x86-64/download-url b/gradle/jdks/21/macos/x86-64/download-url index 4c3d36c468c..376401edcf0 100644 --- a/gradle/jdks/21/macos/x86-64/download-url +++ b/gradle/jdks/21/macos/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-macosx-x64.tar.gz +https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-macosx-x64.tar.gz diff --git a/gradle/jdks/21/macos/x86-64/local-path b/gradle/jdks/21/macos/x86-64/local-path index 7865953940d..4c19e3acf98 100644 --- a/gradle/jdks/21/macos/x86-64/local-path +++ b/gradle/jdks/21/macos/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.4.7.1 +amazon-corretto-21.0.5.11.1 diff --git a/gradle/jdks/21/windows/x86-64/download-url b/gradle/jdks/21/windows/x86-64/download-url index 3d3b6cfa14e..3f0337483ca 100644 --- a/gradle/jdks/21/windows/x86-64/download-url +++ b/gradle/jdks/21/windows/x86-64/download-url @@ -1 +1 @@ -https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-windows-x64-jdk.zip +https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-windows-x64-jdk.zip diff --git a/gradle/jdks/21/windows/x86-64/local-path b/gradle/jdks/21/windows/x86-64/local-path index 7865953940d..4c19e3acf98 100644 --- a/gradle/jdks/21/windows/x86-64/local-path +++ b/gradle/jdks/21/windows/x86-64/local-path @@ -1 +1 @@ -amazon-corretto-21.0.4.7.1 +amazon-corretto-21.0.5.11.1 diff --git a/gradlew b/gradlew index 54730ed6fad..bc3293511ef 100755 --- a/gradlew +++ b/gradlew @@ -68,6 +68,8 @@ if [ -f gradle/gradle-jdks-setup.sh ]; then echo "Failed to set up JDK, running gradle/gradle-jdks-setup.sh failed with non-zero exit code" exit 1 fi + # Setting JAVA_HOME to the gradle daemon to make sure gradlew uses this jdk for `JAVACMD` + JAVA_HOME="$GRADLE_DAEMON_JDK" fi # <<< Gradle JDK setup <<< diff --git a/settings.gradle b/settings.gradle index 036cb36331c..0bdb47f3937 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ buildscript { gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } } } dependencies { - classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.48.0' + classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.54.0' } } plugins {