Use JDK 21 as default JDK instead of JDK 17 (#2008)

* Use JDK 21 as default JDK instead of JDK 17

Testing done:

Before the change (using images downloaded from hub.docker.com):

These images change in the "before" and "after" comparison:

$ for label in 2.479 2.479-alpine 2.479-slim; do docker run -q jenkins/jenkins:$label java -version; done

openjdk version "17.0.12" 2024-07-16
OpenJDK Runtime Environment Temurin-17.0.12+7 (build 17.0.12+7)
OpenJDK 64-Bit Server VM Temurin-17.0.12+7 (build 17.0.12+7, mixed mode)

These images do not change in the "before" and "after" comparison:

$ for label in 2.479-alpine-jdk21 2.479-jdk21 2.479-rhel-ubi9-jdk21 2.479-slim-jdk21; do docker run -q jenkins/jenkins:$label java -version; done

openjdk version "21.0.4" 2024-07-16 LTS
OpenJDK Runtime Environment Temurin-21.0.4+7 (build 21.0.4+7-LTS)
OpenJDK 64-Bit Server VM Temurin-21.0.4+7 (build 21.0.4+7-LTS, mixed mode)

These images do not change in the "before" and "after" comparison:

$ for label in 2.479-alpine-jdk17 2.479-jdk17 2.479-rhel-ubi9-jdk17 2.479-slim-jdk17; do docker run -q jenkins/jenkins:$label java -version; done

openjdk version "17.0.12" 2024-07-16
OpenJDK Runtime Environment Temurin-17.0.12+7 (build 17.0.12+7)
OpenJDK 64-Bit Server VM Temurin-17.0.12+7 (build 17.0.12+7, mixed mode)

After the change:

These images change in the "before" and "after" comparison:

$ for label in 2.479 2.479-alpine 2.479-slim; do docker run -q jenkins/jenkins:$label java -version; done

openjdk version "21.0.6" 2025-01-21 LTS
OpenJDK Runtime Environment Temurin-21.0.6+7 (build 21.0.6+7-LTS)
OpenJDK 64-Bit Server VM Temurin-21.0.6+7 (build 21.0.6+7-LTS, mixed mode)

These images do not change in the "before" and "after" comparison:

$ for label in 2.479-alpine-jdk21 2.479-jdk21 2.479-rhel-ubi9-jdk21 2.479-slim-jdk21; do docker run -q jenkins/jenkins:$label java -version; done

openjdk version "21.0.6" 2025-01-21 LTS
OpenJDK Runtime Environment Temurin-21.0.6+7 (build 21.0.6+7-LTS)
OpenJDK 64-Bit Server VM Temurin-21.0.6+7 (build 21.0.6+7-LTS, mixed mode)

These images do not change in the "before" and "after" comparison:

$ for label in 2.479-alpine-jdk17 2.479-jdk17 2.479-rhel-ubi9-jdk17 2.479-slim-jdk17; do docker run -q jenkins/jenkins:$label java -version; done

openjdk version "17.0.14" 2025-01-21
OpenJDK Runtime Environment Temurin-17.0.14+7 (build 17.0.14+7)
OpenJDK 64-Bit Server VM Temurin-17.0.14+7 (build 17.0.14+7, mixed mode)

* Reduce tagging of Windows JDK 17 containers

Only tag those specifically identified as JDK 17

JDK 21 build will be used for tags without JDK version

Author: MarkEWaite

build-windows.yaml

@@ -14,8 +14,6 @@ services:
         WINDOWS_VERSION: ${WINDOWS_VERSION}
       tags:
         - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk17-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
-        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
   jdk21:
     image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
     build:

docker-bake.hcl

@@ -134,14 +134,10 @@ target "alpine_jdk17" {
     JAVA_VERSION       = JAVA17_VERSION
   }
   tags = [
-    tag(true, "alpine"),
     tag(true, "alpine-jdk17"),
-    tag_weekly(false, "alpine"),
     tag_weekly(false, "alpine-jdk17"),
     tag_weekly(false, "alpine${ALPINE_SHORT_TAG}-jdk17"),
-    tag_lts(false, "lts-alpine"),
     tag_lts(false, "lts-alpine-jdk17"),
-    tag_lts(true, "lts-alpine")
   ]
   platforms = ["linux/amd64"]
 }
@@ -158,10 +154,14 @@ target "alpine_jdk21" {
     JAVA_VERSION       = JAVA21_VERSION
   }
   tags = [
+    tag(true, "alpine"),
     tag(true, "alpine-jdk21"),
+    tag_weekly(false, "alpine"),
     tag_weekly(false, "alpine-jdk21"),
     tag_weekly(false, "alpine${ALPINE_SHORT_TAG}-jdk21"),
-    tag_lts(false, "lts-alpine-jdk21")
+    tag_lts(false, "lts-alpine"),
+    tag_lts(false, "lts-alpine-jdk21"),
+    tag_lts(true, "lts-alpine"),
   ]
   platforms = ["linux/amd64", "linux/arm64"]
 }
@@ -178,14 +178,10 @@ target "debian_jdk17" {
     JAVA_VERSION       = JAVA17_VERSION
   }
   tags = [
-    tag(true, ""),
     tag(true, "jdk17"),
-    tag_weekly(false, "latest"),
     tag_weekly(false, "latest-jdk17"),
     tag_weekly(false, "jdk17"),
-    tag_lts(false, "lts"),
     tag_lts(false, "lts-jdk17"),
-    tag_lts(true, "lts"),
     tag_lts(true, "lts-jdk17")
   ]
   platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/ppc64le"]
@@ -203,10 +199,14 @@ target "debian_jdk21" {
     JAVA_VERSION       = JAVA21_VERSION
   }
   tags = [
+    tag(true, ""),
     tag(true, "jdk21"),
+    tag_weekly(false, "latest"),
     tag_weekly(false, "latest-jdk21"),
     tag_weekly(false, "jdk21"),
+    tag_lts(false, "lts"),
     tag_lts(false, "lts-jdk21"),
+    tag_lts(true, "lts"),
     tag_lts(true, "lts-jdk21")
   ]
   platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/ppc64le"]
@@ -224,13 +224,9 @@ target "debian_slim_jdk17" {
     JAVA_VERSION       = JAVA17_VERSION
   }
   tags = [
-    tag(true, "slim"),
     tag(true, "slim-jdk17"),
-    tag_weekly(false, "slim"),
     tag_weekly(false, "slim-jdk17"),
-    tag_lts(false, "lts-slim"),
     tag_lts(false, "lts-slim-jdk17"),
-    tag_lts(true, "lts-slim"),
   ]
   platforms = ["linux/amd64"]
 }
@@ -247,9 +243,13 @@ target "debian_slim_jdk21" {
     JAVA_VERSION       = JAVA21_VERSION
   }
   tags = [
+    tag(true, "slim"),
     tag(true, "slim-jdk21"),
+    tag_weekly(false, "slim"),
     tag_weekly(false, "slim-jdk21"),
+    tag_lts(false, "lts-slim"),
     tag_lts(false, "lts-slim-jdk21"),
+    tag_lts(true, "lts-slim"),
   ]
   platforms = ["linux/amd64", "linux/arm64"]
 }