From 0f077cb8068ab6af0d49e7bee6896c8f5baf1782 Mon Sep 17 00:00:00 2001 From: app-autoscaler-ci-bot Date: Thu, 17 Oct 2024 08:16:13 +0100 Subject: [PATCH] Update java version to 21.0.5 --- .../tasks/update-sdk/download_java.sh | 31 ------------------- config/blobs.yml | 4 +++ packages/openjdk-21/spec | 2 +- packages/openjdk-21/version | 2 +- 4 files changed, 6 insertions(+), 33 deletions(-) delete mode 100755 ci/autoscaler/tasks/update-sdk/download_java.sh diff --git a/ci/autoscaler/tasks/update-sdk/download_java.sh b/ci/autoscaler/tasks/update-sdk/download_java.sh deleted file mode 100755 index ceb8b29b0f..0000000000 --- a/ci/autoscaler/tasks/update-sdk/download_java.sh +++ /dev/null @@ -1,31 +0,0 @@ -#! /usr/bin/env bash - -# This script is used to download java version used in the bosh packaging -# It fetch the given SAP Machine java distribution -# usage: ./download_java.sh 21.0.3 - -set -euo pipefail - -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -source "${script_dir}/vars.source.sh" - -JAVA_VERSION=${1:-"21.0.3"} - -# Step 1 --> Download java from https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.3/sapmachine-jdk-21.0.3_linux-x64_bin.tar.gz -SAP_MACHINE_BASE_URL="https://github.com/SAP/SapMachine" -binary_name="sapmachine-jdk-${JAVA_VERSION}_linux-x64_bin.tar.gz" - -printf "\n" -jdk_download_url="${SAP_MACHINE_BASE_URL}/releases/download/sapmachine-${JAVA_VERSION}/${binary_name}" - -echo "Fetching SAP Machine JDK ${JAVA_VERSION} from ${jdk_download_url}" -# shellcheck disable=SC2154 -pushd "${autoscaler_dir}" - mkdir -p src/binaries/jdk && pushd src/binaries/jdk > /dev/null - curl -JLO "${jdk_download_url}" - popd > /dev/null -popd > /dev/null - -# Step 2 --> Build java -jdk_version="$(find . -name "sapmachine*.tar.gz" | cut -d'-' -f3 | cut -d'_' -f1)" -echo "Downloaded JDK version: $jdk_version" diff --git a/config/blobs.yml b/config/blobs.yml index affa6ec68b..fa3536af7d 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -6,3 +6,7 @@ sapmachine-jdk-21.0.4_linux-x64_bin.tar.gz: size: 208055144 object_id: a5bb48f2-ae8e-4b00-7655-b553b1a264d7 sha: sha256:9c4779b48a9d6f8120901e6c095227baebd2af2d7d7db1b0196c144ae9b9397d +sapmachine-jdk-21.0.5_linux-x64_bin.tar.gz: + size: 207370814 + object_id: f4da1511-579b-4ffa-7e5c-8be67d1d18dd + sha: sha256:713056536aea7bbb1f93fe978df20f69e23f37171abf272068339f75525b84d3 diff --git a/packages/openjdk-21/spec b/packages/openjdk-21/spec index 5ea5e9c17e..cecfc85783 100644 --- a/packages/openjdk-21/spec +++ b/packages/openjdk-21/spec @@ -2,4 +2,4 @@ name: openjdk-21 dependencies: [] files: -- sapmachine-jdk-21.0.4_linux-x64_bin.tar.gz # from https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.4/sapmachine-jdk-21.0.4_linux-x64_bin.tar.gz +- sapmachine-jdk-21.0.5_linux-x64_bin.tar.gz # from https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.5/sapmachine-jdk-21.0.5_linux-x64_bin.tar.gz diff --git a/packages/openjdk-21/version b/packages/openjdk-21/version index 3af11cddcd..93b8ba970f 100644 --- a/packages/openjdk-21/version +++ b/packages/openjdk-21/version @@ -1 +1 @@ -21.0.4 \ No newline at end of file +21.0.5 \ No newline at end of file