From 76bd794ab7265fcd885e57ee918814080763a2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Thu, 16 Oct 2025 00:01:33 +0200
Subject: [PATCH] Replace references to JDK17 by default to JDK21 (#534)

---
 Jenkinsfile                       | 2 +-
 molecule/default/install-deb.yml  | 6 ++++++
 molecule/default/install-rpm.yml  | 4 ++--
 molecule/default/install-suse.yml | 2 +-
 molecule/default/molecule.yml     | 8 ++++++++
 molecule/servlet/molecule.yml     | 2 +-
 msi/build/jenkins.wxs             | 2 +-
 systemd/jenkins.service           | 2 +-
 templates/header.debian.html      | 3 ++-
 templates/header.opensuse.html    | 2 +-
 10 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9585467a..626d69ff 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ if (env.BRANCH_IS_PRIMARY) {
 properties(jobProperties)
 
 podTemplate(
-  inheritFrom: 'jnlp-maven-17',
+  inheritFrom: 'jnlp-maven-21',
   workingDir: '/home/jenkins/agent',
   containers: [
     containerTemplate(name: 'jnlp', image: 'jenkinsciinfra/packaging:latest')
diff --git a/molecule/default/install-deb.yml b/molecule/default/install-deb.yml
index ff4fc597..6b79c5e1 100644
--- a/molecule/default/install-deb.yml
+++ b/molecule/default/install-deb.yml
@@ -8,6 +8,12 @@
     name:
       - openjdk-17-jre
     state: present
+  when: ansible_distribution == "Debian" and ansible_distribution_major_version < "13"
+- package:
+    name:
+      - openjdk-21-jre
+    state: present
+  when: (ansible_distribution == "Debian" and ansible_distribution_major_version == "13") or ansible_distribution == "Ubuntu"
 - find:
     paths: /var/tmp/target/debian
     file_type: file
diff --git a/molecule/default/install-rpm.yml b/molecule/default/install-rpm.yml
index cb055b86..be9af097 100644
--- a/molecule/default/install-rpm.yml
+++ b/molecule/default/install-rpm.yml
@@ -6,12 +6,12 @@
     update_cache: true
 - package:
     name:
-      - java-17-openjdk
+      - java-21-openjdk
     state: present
   when: ansible_distribution != 'Amazon' and (ansible_distribution != 'CentOS' or ansible_distribution_major_version != '10')
 - package:
     name:
-      - java-17-amazon-corretto
+      - java-21-amazon-corretto
     state: present
   when: ansible_distribution == 'Amazon'
 - package:
diff --git a/molecule/default/install-suse.yml b/molecule/default/install-suse.yml
index 5c92bd38..e10a1fa1 100644
--- a/molecule/default/install-suse.yml
+++ b/molecule/default/install-suse.yml
@@ -3,7 +3,7 @@
     name:
       - dejavu-fonts
       - fontconfig
-      - java-17-openjdk
+      - java-21-openjdk
     state: present
     update_cache: true
 - file:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8884b7b0..e2a52f92 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -22,6 +22,14 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     cgroupns_mode: host
     privileged: true
+  - name: debian-13  # EOL 2030-06-30 (LTS)
+    image: dokken/debian-13:latest
+    override_command: false
+    volumes:
+      - ${MOLECULE_PROJECT_DIRECTORY}/target:/var/tmp/target
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    privileged: true
   - name: ubuntu-22-04  # EOL 2027-04-01
     image: dokken/ubuntu-22.04:latest
     override_command: false
diff --git a/molecule/servlet/molecule.yml b/molecule/servlet/molecule.yml
index 9a4d9231..a77c9dab 100644
--- a/molecule/servlet/molecule.yml
+++ b/molecule/servlet/molecule.yml
@@ -5,7 +5,7 @@ driver:
   name: docker
 platforms:
   - name: tomcat-10
-    image: tomcat:10-jdk17-temurin
+    image: tomcat:10-jdk21-temurin
     volumes:
       - ${MOLECULE_PROJECT_DIRECTORY}/jenkins.war:/usr/local/tomcat/webapps/jenkins.war
 provisioner:
diff --git a/msi/build/jenkins.wxs b/msi/build/jenkins.wxs
index 6b47b6a1..eccbe676 100644
--- a/msi/build/jenkins.wxs
+++ b/msi/build/jenkins.wxs
@@ -168,7 +168,7 @@
         Return="check"
         Impersonate="no" />
 
-    <!-- This will find the JRE/JDK directory either Java 17 or 21 (prefer 17) -->
+    <!-- This will find the JRE/JDK directory either Java 17 or 21 (prefer 21) -->
     <Property Id="JAVA_HOME">
       <RegistrySearch Id="JDK21_HOME_REGSEARCH" Root="HKLM" Key="SOFTWARE\JavaSoft\JDK\21" Name="JavaHome" Type="raw" Win64="yes" />
       <RegistrySearch Id="JDK17_HOME_REGSEARCH" Root="HKLM" Key="SOFTWARE\JavaSoft\JDK\17" Name="JavaHome" Type="raw" Win64="yes" />
diff --git a/systemd/jenkins.service b/systemd/jenkins.service
index 724dc1a3..84497a10 100644
--- a/systemd/jenkins.service
+++ b/systemd/jenkins.service
@@ -50,7 +50,7 @@ Environment="JENKINS_WEBROOT=%C/@@ARTIFACTNAME@@/war"
 #Environment="JENKINS_LOG=%L/@@ARTIFACTNAME@@/@@ARTIFACTNAME@@.log"
 
 # The Java home directory. When left empty, JENKINS_JAVA_CMD and PATH are consulted.
-#Environment="JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64"
+#Environment="JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64"
 
 # The Java executable. When left empty, JAVA_HOME and PATH are consulted.
 #Environment="JENKINS_JAVA_CMD=/etc/alternatives/java"
diff --git a/templates/header.debian.html b/templates/header.debian.html
index e6b5cdc8..cb96f629 100644
--- a/templates/header.debian.html
+++ b/templates/header.debian.html
@@ -29,9 +29,10 @@
   <pre class="text-white bg-dark">
    <code>
   sudo apt-get update
-  sudo apt-get install fontconfig openjdk-17-jre
+  sudo apt-get install fontconfig openjdk-21-jre
   sudo apt-get install {{artifactName}}</code>
   </pre>
+(Install <code>openjdk-17-jre</code> on Debian 12 or earlier)
 </p>
 
 <p>
diff --git a/templates/header.opensuse.html b/templates/header.opensuse.html
index cb0e7d19..ad8cf48a 100644
--- a/templates/header.opensuse.html
+++ b/templates/header.opensuse.html
@@ -15,7 +15,7 @@
 
 <pre class="text-white bg-dark">
 
-  zypper install dejavu-fonts fontconfig java-17-openjdk
+  zypper install dejavu-fonts fontconfig java-21-openjdk
   zypper install {{ artifactName }}
 
 </pre>