From 263f1429dea73160f0486b48c40a243385eebb27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20MERLE?=
 <95630726+smerle33@users.noreply.github.com>
Date: Fri, 11 Aug 2023 11:09:19 +0200
Subject: [PATCH 1/3] feat(jdk21): add a check on agent availability

as per https://github.com/jenkins-infra/helpdesk/issues/3709 add a check for jdk 21
---
 checks.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/checks.sh b/checks.sh
index 56507a1..6130e1d 100755
--- a/checks.sh
+++ b/checks.sh
@@ -70,6 +70,8 @@ if [ $# -ge 1 ] && [ -n "$1" ] && [ "$1" != "kubernetes" ]; then
 		jdk="jdk-17";;
 	maven-19 | jdk-19)
 		jdk="jdk-19";;
+  	maven-21 | jdk-21)
+		jdk="jdk-21";;
 	*)
 		echo "Label '$1' specified. Using default jdk."
 	esac
@@ -87,6 +89,9 @@ if [ $# -ge 1 ] && [ -n "$1" ] && [ "$1" != "kubernetes" ]; then
 	jdk-19)
 		jdknumber="19."
 		;;
+	jdk-21)
+		jdknumber="21."
+		;;
 	*)
 		echo "ERROR: JDK not matching the expected ${jdk} for label '$1'"
 		mvn -v 2>&1

From 98b872dd494e075bb2bfaf323d8fbb3e557eb472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20MERLE?=
 <95630726+smerle33@users.noreply.github.com>
Date: Fri, 11 Aug 2023 11:12:43 +0200
Subject: [PATCH 2/3] Update Jenkinsfile maven 21

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 795fb36..eb3c3da 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ properties([
 // Define the sequential stages and the parallel steps inside each stage
 def sequentialStages = [:]
 // Labels requested in https://github.com/jenkins-infra/pipeline-library/blob/master/vars/buildPlugin.groovy and https://github.com/jenkins-infra/pipeline-library/blob/master/vars/buildPluginWithGradle.groovy
-sequentialStages['Tool'] = [ 'maven', 'maven-11', 'maven-17', 'maven-19', 'maven-windows', 'maven-11-windows', 'maven-17-windows', 'maven-19-windows']
+sequentialStages['Tool'] = [ 'maven', 'maven-11', 'maven-17', 'maven-19', 'maven-windows', 'maven-11-windows', 'maven-17-windows', 'maven-19-windows', 'maven-21']
 sequentialStages['Processor'] = [ 's390x', 'amd64' ] // 'arm64', not tested, unavailable
 sequentialStages['Docker'] = [ 's390xdocker', 'docker', 'docker-windows'] //'arm64docker', not tested, unavailable
 

From 279a9360eefc055ff301255ee9711aef8a39bfda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20MERLE?=
 <95630726+smerle33@users.noreply.github.com>
Date: Fri, 11 Aug 2023 15:32:57 +0200
Subject: [PATCH 3/3] Update checks.sh

---
 checks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/checks.sh b/checks.sh
index 6130e1d..1c941d1 100755
--- a/checks.sh
+++ b/checks.sh
@@ -90,7 +90,7 @@ if [ $# -ge 1 ] && [ -n "$1" ] && [ "$1" != "kubernetes" ]; then
 		jdknumber="19."
 		;;
 	jdk-21)
-		jdknumber="21."
+		jdknumber="21-beta"
 		;;
 	*)
 		echo "ERROR: JDK not matching the expected ${jdk} for label '$1'"