From c90e69aa912bd20759397010f75b400392facf1d Mon Sep 17 00:00:00 2001
From: Arsalan Khan <muhammad.arsalan.khan@sap.com>
Date: Wed, 16 Oct 2024 11:33:51 +0200
Subject: [PATCH 1/2] remove tag regex

---
 ci/autoscaler/pipeline.yml                            | 2 +-
 ci/autoscaler/tasks/update-sdk/update_java_package.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ci/autoscaler/pipeline.yml b/ci/autoscaler/pipeline.yml
index 528af0340f..5004079100 100644
--- a/ci/autoscaler/pipeline.yml
+++ b/ci/autoscaler/pipeline.yml
@@ -174,7 +174,7 @@ resources:
     uri: https://github.com/SAP/SapMachine.git
     branch: sapmachine21 # use JDK 21 as the LTS version
     fetch_tags: true
-    tag_regex: 'sapmachine-[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'
+    #tag_regex: 'sapmachine-[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'
     version_depth: 50
 
 - name: gcp-jammy-stemcell
diff --git a/ci/autoscaler/tasks/update-sdk/update_java_package.sh b/ci/autoscaler/tasks/update-sdk/update_java_package.sh
index 2a9b96953d..415e88fdf9 100755
--- a/ci/autoscaler/tasks/update-sdk/update_java_package.sh
+++ b/ci/autoscaler/tasks/update-sdk/update_java_package.sh
@@ -17,13 +17,15 @@ pushd "${java_dir}"
   java_version_interim=$(grep "DEFAULT_VERSION_INTERIM" make/conf/version-numbers.conf | cut -d= -f2)
   java_version_update=$(grep "DEFAULT_VERSION_UPDATE" make/conf/version-numbers.conf | cut -d= -f2)
   java_version_prerelease=$(grep "DEFAULT_PROMOTED_VERSION_PRE" make/conf/version-numbers.conf | cut -d= -f2)
+  java_full_version=$(grep '^version=' .jcheck/conf | cut -d'=' -f2 | tr -d '[:space:]' | sed 's/.$//')
+
 popd
 
 sapmachine_java_version="${java_major_version}.${java_version_interim}.${java_version_update}"
 echo "Desired Java Version: ${sapmachine_java_version}"
 
 # consider only lts releases
-if [ "${java_version_prerelease}" != "" ]; then
+if [ "${java_full_version}" != "${sapmachine_java_version}" ]; then
      echo "java version ${sapmachine_java_version} is not a LTS release. skipping update"
      exit 0
 fi

From 84c992f48918d8d58fc8bd1288ad82dd54139d47 Mon Sep 17 00:00:00 2001
From: app-autoscaler-ci-bot <ApplicationAutoscaler@sap.com>
Date: Wed, 16 Oct 2024 13:21:56 +0100
Subject: [PATCH 2/2] Update java version to 21.0.5

---
 config/blobs.yml            | 4 ++++
 packages/openjdk-21/spec    | 2 +-
 packages/openjdk-21/version | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/blobs.yml b/config/blobs.yml
index affa6ec68b..9d448c764c 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: c2891079-2bee-4852-79aa-2bac118994f1
+  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