Replace references to JDK17 by default to JDK21 (backport of #534 into stable-2.528) (#535)

Replace references to JDK17 by default to JDK21 (#534)

Author: lemeurherve

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')

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

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:

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:

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

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:

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" />

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"

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>

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>