From e90f2449b83297775e886c2bb89fa70df9afccea Mon Sep 17 00:00:00 2001
From: "jenkins-infra-updatecli[bot]"
 <101213878+jenkins-infra-updatecli[bot]@users.noreply.github.com>
Date: Sat, 28 Oct 2023 15:47:31 +0200
Subject: [PATCH] Bump JDK21 version to 21.0.1+12 (#884)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Update the JDK21 version in the goss test

Made with ❤️️ by updatecli

* chore: Update the JDK21 version in the Packer default values

Made with ❤️️ by updatecli

---------

Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com>
---
 goss/goss-windows.yaml          | 2 +-
 goss/goss.yaml                  | 2 +-
 provisioning/tools-versions.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/goss/goss-windows.yaml b/goss/goss-windows.yaml
index dd869b0ce..48b09c9e3 100644
--- a/goss/goss-windows.yaml
+++ b/goss/goss-windows.yaml
@@ -23,7 +23,7 @@ command:
     exec: C:\tools\jdk-21\bin\java.exe --version
     exit-status: 0
     stdout:
-      - 21+35
+      - 21.0.1+12
   trivy:
     exec: trivy --version
     exit-status: 0
diff --git a/goss/goss.yaml b/goss/goss.yaml
index cfb32ab1b..2ea59bee2 100644
--- a/goss/goss.yaml
+++ b/goss/goss.yaml
@@ -18,7 +18,7 @@ command:
     exec: /opt/jdk-21/bin/java --version
     exit-status: 0
     stdout:
-      - 21+35
+      - 21.0.1+12
   trivy:
     exec: trivy --version
     exit-status: 0
diff --git a/provisioning/tools-versions.yml b/provisioning/tools-versions.yml
index 6ebd1c450..67d1f84b1 100644
--- a/provisioning/tools-versions.yml
+++ b/provisioning/tools-versions.yml
@@ -14,7 +14,7 @@ goss_version: 0.4.2
 hadolint_version: 2.12.0
 jdk11_version: 11.0.21+9
 jdk17_version: 17.0.8.1+1
-jdk21_version: 21+35
+jdk21_version: 21.0.1+12
 jdk8_version: 8u392-b08
 jenkins_remoting_version: 3192.v713e3b_039fb_e
 jq_version: 1.6