Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update java version to 21.0.5 #3274

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/autoscaler/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion ci/autoscaler/tasks/update-sdk/update_java_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [shellcheck] reported by reviewdog 🐶
java_version_prerelease appears unused. Verify use (or export if used externally). SC2034

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
Expand Down
4 changes: 4 additions & 0 deletions config/blobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion packages/openjdk-21/spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion packages/openjdk-21/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21.0.4
21.0.5
Loading