feat: add JDK25 images (#2146)

lemeurherve · lemeurherve · commit f71a1a007a5e · 2026-01-19T02:15:33.000+01:00
* feat: add JDK25 images

* no jlink for now
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -122,12 +122,16 @@ stage('Build') {
             def images = [
                 'alpine_jdk17',
                 'alpine_jdk21',
+                'alpine_jdk25',
                 'debian_jdk17',
                 'debian_jdk21',
+                'debian_jdk25',
                 'debian-slim_jdk17',
                 'debian-slim_jdk21',
+                'debian-slim_jdk25',
                 'rhel_jdk17',
                 'rhel_jdk21',
+                'rhel_jdk25',
             ]
             for (i in images) {
                 def imageToBuild = i
diff --git a/alpine/hotspot/Dockerfile b/alpine/hotspot/Dockerfile
@@ -21,19 +21,24 @@ ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
 # Generate smaller java runtime without unneeded files
 # for now we include the full module path to maintain compatibility
 # while still saving space (approx 200mb from the full distribution)
-RUN case "$(jlink --version 2>&1)" in \
-      "17."*) set -- "--compress=2" ;; \
-      # the compression argument is different for JDK21
-      "21."*) set -- "--compress=zip-6" ;; \
-      *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
-    esac; \
-    jlink \
-      --strip-java-debug-attributes \
-      "$1" \
-      --add-modules ALL-MODULE-PATH \
-      --no-man-pages \
-      --no-header-files \
-      --output /javaruntime
+# hadolint ignore=SC2086
+RUN java_major_version="$(jlink --version 2>&1 | cut -c1-2)"; \
+    if [ "$java_major_version" = "25" ]; then \
+      cp -r "/opt/jdk-${JAVA_VERSION}" /javaruntime; \
+    else \
+      case "$java_major_version" in \
+        "17") options="--compress=2" ;; \
+        "21") options="--compress=zip-6" ;; \
+        *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
+      esac; \
+      jlink \
+        --strip-java-debug-attributes \
+        ${options} \
+        --add-modules ALL-MODULE-PATH \
+        --no-man-pages \
+        --no-header-files \
+        --output /javaruntime; \
+    fi
 
 FROM alpine:"${ALPINE_TAG}" AS controller
 
diff --git a/build-windows.yaml b/build-windows.yaml
@@ -31,3 +31,21 @@ services:
         - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk21-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}
+  jdk25:
+    image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}${SEPARATOR_LTS_PREFIX}jdk25-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
+    build:
+      context: ./
+      dockerfile: ./windows/${WINDOWS_FLAVOR}/hotspot/Dockerfile
+      args:
+        COMMIT_SHA: ${COMMIT_SHA}
+        JAVA_HOME: "C:/openjdk-25"
+        JAVA_VERSION: 25.0.1_8
+        WAR_SHA: ${WAR_SHA}
+        JENKINS_VERSION: ${JENKINS_VERSION}
+        WAR_URL: ${WAR_URL}
+        TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
+        WINDOWS_VERSION: ${WINDOWS_VERSION}
+      tags:
+        - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk25-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}
diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -23,19 +23,24 @@ ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
 # Generate smaller java runtime without unneeded files
 # for now we include the full module path to maintain compatibility
 # while still saving space (approx 200mb from the full distribution)
-RUN case "$(jlink --version 2>&1)" in \
-      "17."*) set -- "--compress=2" ;; \
-      # the compression argument is different for JDK21
-      "21."*) set -- "--compress=zip-6" ;; \
-      *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
-    esac; \
-    jlink \
-      --strip-java-debug-attributes \
-      "$1" \
-      --add-modules ALL-MODULE-PATH \
-      --no-man-pages \
-      --no-header-files \
-      --output /javaruntime
+# hadolint ignore=SC2086
+RUN java_major_version="$(jlink --version 2>&1 | cut -c1-2)"; \
+    if [ "$java_major_version" = "25" ]; then \
+      cp -r "/opt/jdk-${JAVA_VERSION}" /javaruntime; \
+    else \
+      case "$java_major_version" in \
+        "17") options="--compress=2" ;; \
+        "21") options="--compress=zip-6" ;; \
+        *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
+      esac; \
+      jlink \
+        --strip-java-debug-attributes \
+        ${options} \
+        --add-modules ALL-MODULE-PATH \
+        --no-man-pages \
+        --no-header-files \
+        --output /javaruntime; \
+    fi
 
 FROM debian:"${DEBIAN_RELEASE_LINE}-${DEBIAN_VERSION}${DEBIAN_VARIANT}" AS controller
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,6 +1,6 @@
 ## Variables
 variable "jdks_to_build" {
-  default = [17, 21]
+  default = [17, 21, 25]
 }
 
 variable "windows_version_to_build_for_lts" {
@@ -67,6 +67,10 @@ variable "JAVA21_VERSION" {
   default = "21.0.9_10"
 }
 
+variable "JAVA25_VERSION" {
+  default = "25.0.1_8"
+}
+
 variable "DEBIAN_RELEASE_LINE" {
   default = "trixie"
 }
@@ -93,6 +97,7 @@ variable "jdk_versions" {
   default = {
     17 = JAVA17_VERSION
     21 = JAVA21_VERSION
+    25 = JAVA25_VERSION
   }
 }
 
diff --git a/rhel/Dockerfile b/rhel/Dockerfile
@@ -21,19 +21,24 @@ ENV PATH="/opt/jdk-${JAVA_VERSION}/bin:${PATH}"
 # Generate smaller java runtime without unneeded files
 # for now we include the full module path to maintain compatibility
 # while still saving space (approx 200mb from the full distribution)
-RUN case "$(jlink --version 2>&1)" in \
-      "17."*) set -- "--compress=2" ;; \
-      # the compression argument is different for JDK21
-      "21."*) set -- "--compress=zip-6" ;; \
-      *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
-    esac; \
-    jlink \
-      --strip-java-debug-attributes \
-      "$1" \
-      --add-modules ALL-MODULE-PATH \
-      --no-man-pages \
-      --no-header-files \
-      --output /javaruntime
+# hadolint ignore=SC2086
+RUN java_major_version="$(jlink --version 2>&1 | cut -c1-2)"; \
+    if [ "$java_major_version" = "25" ]; then \
+      cp -r "/opt/jdk-${JAVA_VERSION}" /javaruntime; \
+    else \
+      case "$java_major_version" in \
+        "17") options="--compress=2" ;; \
+        "21") options="--compress=zip-6" ;; \
+        *) echo "ERROR: unmanaged jlink version pattern" && exit 1 ;; \
+      esac; \
+      jlink \
+        --strip-java-debug-attributes \
+        ${options} \
+        --add-modules ALL-MODULE-PATH \
+        --no-man-pages \
+        --no-header-files \
+        --output /javaruntime; \
+    fi
 
 FROM registry.access.redhat.com/${RHEL_RELEASE_LINE}/ubi:${RHEL_TAG} AS controller
 
diff --git a/tests/golden/expected_platforms.txt b/tests/golden/expected_platforms.txt
@@ -1,9 +1,13 @@
 alpine_jdk17:linux/amd64
 alpine_jdk21:linux/amd64
 alpine_jdk21:linux/arm64
+alpine_jdk25:linux/amd64
+alpine_jdk25:linux/arm64
 debian-slim_jdk17:linux/amd64
 debian-slim_jdk21:linux/amd64
 debian-slim_jdk21:linux/arm64
+debian-slim_jdk25:linux/amd64
+debian-slim_jdk25:linux/arm64
 debian_jdk17:linux/amd64
 debian_jdk17:linux/arm64
 debian_jdk17:linux/ppc64le
@@ -12,11 +16,19 @@ debian_jdk21:linux/amd64
 debian_jdk21:linux/arm64
 debian_jdk21:linux/ppc64le
 debian_jdk21:linux/s390x
+debian_jdk25:linux/amd64
+debian_jdk25:linux/arm64
+debian_jdk25:linux/ppc64le
+debian_jdk25:linux/s390x
 rhel_jdk17:linux/amd64
 rhel_jdk17:linux/arm64
 rhel_jdk17:linux/ppc64le
 rhel_jdk21:linux/amd64
 rhel_jdk21:linux/arm64
 rhel_jdk21:linux/ppc64le
+rhel_jdk25:linux/amd64
+rhel_jdk25:linux/arm64
+rhel_jdk25:linux/ppc64le
 windowsservercore-ltsc2019_jdk17:windows/amd64
 windowsservercore-ltsc2019_jdk21:windows/amd64
+windowsservercore-ltsc2019_jdk25:windows/amd64
diff --git a/tests/golden/expected_tags.txt b/tests/golden/expected_tags.txt
@@ -2,13 +2,18 @@ docker.io/jenkins/jenkins:2.534 (debian_jdk21)
 docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:2.534-alpine-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21)
+docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25)
 docker.io/jenkins/jenkins:2.534-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
 docker.io/jenkins/jenkins:2.534-jdk17 (debian_jdk17)
 docker.io/jenkins/jenkins:2.534-jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk17)
 docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21)
 docker.io/jenkins/jenkins:2.534-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
+docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25)
+docker.io/jenkins/jenkins:2.534-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25)
 docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk17 (rhel_jdk17)
 docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21)
+docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25)
 docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21)
 docker.io/jenkins/jenkins:2.534-slim-jdk17 (debian-slim_jdk17)
 docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21)
+docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25)
diff --git a/tests/golden/expected_tags_latest_lts.txt b/tests/golden/expected_tags_latest_lts.txt
@@ -2,35 +2,47 @@ docker.io/jenkins/jenkins:2.504.3 (debian_jdk21)
 docker.io/jenkins/jenkins:2.504.3-alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:2.504.3-alpine-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:2.504.3-alpine-jdk21 (alpine_jdk21)
+docker.io/jenkins/jenkins:2.504.3-alpine-jdk25 (alpine_jdk25)
 docker.io/jenkins/jenkins:2.504.3-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
 docker.io/jenkins/jenkins:2.504.3-jdk17 (debian_jdk17)
 docker.io/jenkins/jenkins:2.504.3-jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk17)
 docker.io/jenkins/jenkins:2.504.3-jdk21 (debian_jdk21)
 docker.io/jenkins/jenkins:2.504.3-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
+docker.io/jenkins/jenkins:2.504.3-jdk25 (debian_jdk25)
+docker.io/jenkins/jenkins:2.504.3-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25)
 docker.io/jenkins/jenkins:2.504.3-lts (debian_jdk21)
 docker.io/jenkins/jenkins:2.504.3-lts-alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:2.504.3-lts-jdk17 (debian_jdk17)
 docker.io/jenkins/jenkins:2.504.3-lts-jdk21 (debian_jdk21)
+docker.io/jenkins/jenkins:2.504.3-lts-jdk25 (debian_jdk25)
 docker.io/jenkins/jenkins:2.504.3-lts-rhel-ubi9-jdk17 (rhel_jdk17)
 docker.io/jenkins/jenkins:2.504.3-lts-rhel-ubi9-jdk21 (rhel_jdk21)
+docker.io/jenkins/jenkins:2.504.3-lts-rhel-ubi9-jdk25 (rhel_jdk25)
 docker.io/jenkins/jenkins:2.504.3-lts-slim (debian-slim_jdk21)
 docker.io/jenkins/jenkins:2.504.3-rhel-ubi9-jdk17 (rhel_jdk17)
 docker.io/jenkins/jenkins:2.504.3-rhel-ubi9-jdk21 (rhel_jdk21)
+docker.io/jenkins/jenkins:2.504.3-rhel-ubi9-jdk25 (rhel_jdk25)
 docker.io/jenkins/jenkins:2.504.3-slim (debian-slim_jdk21)
 docker.io/jenkins/jenkins:2.504.3-slim-jdk17 (debian-slim_jdk17)
 docker.io/jenkins/jenkins:2.504.3-slim-jdk21 (debian-slim_jdk21)
+docker.io/jenkins/jenkins:2.504.3-slim-jdk25 (debian-slim_jdk25)
 docker.io/jenkins/jenkins:2.504.3-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
 docker.io/jenkins/jenkins:lts (debian_jdk21)
 docker.io/jenkins/jenkins:lts-alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:lts-alpine-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:lts-alpine-jdk21 (alpine_jdk21)
+docker.io/jenkins/jenkins:lts-alpine-jdk25 (alpine_jdk25)
 docker.io/jenkins/jenkins:lts-jdk17 (debian_jdk17)
 docker.io/jenkins/jenkins:lts-jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk17)
 docker.io/jenkins/jenkins:lts-jdk21 (debian_jdk21)
 docker.io/jenkins/jenkins:lts-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
+docker.io/jenkins/jenkins:lts-jdk25 (debian_jdk25)
+docker.io/jenkins/jenkins:lts-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25)
 docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk17 (rhel_jdk17)
 docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk21 (rhel_jdk21)
+docker.io/jenkins/jenkins:lts-rhel-ubi9-jdk25 (rhel_jdk25)
 docker.io/jenkins/jenkins:lts-slim (debian-slim_jdk21)
 docker.io/jenkins/jenkins:lts-slim-jdk17 (debian-slim_jdk17)
 docker.io/jenkins/jenkins:lts-slim-jdk21 (debian-slim_jdk21)
+docker.io/jenkins/jenkins:lts-slim-jdk25 (debian-slim_jdk25)
 docker.io/jenkins/jenkins:lts-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
diff --git a/tests/golden/expected_tags_latest_weekly.txt b/tests/golden/expected_tags_latest_weekly.txt
@@ -2,32 +2,44 @@ docker.io/jenkins/jenkins:2.534 (debian_jdk21)
 docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:2.534-alpine-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21)
+docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25)
 docker.io/jenkins/jenkins:2.534-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
 docker.io/jenkins/jenkins:2.534-jdk17 (debian_jdk17)
 docker.io/jenkins/jenkins:2.534-jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk17)
 docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21)
 docker.io/jenkins/jenkins:2.534-jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
+docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25)
+docker.io/jenkins/jenkins:2.534-jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25)
 docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk17 (rhel_jdk17)
 docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21)
+docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25)
 docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21)
 docker.io/jenkins/jenkins:2.534-slim-jdk17 (debian-slim_jdk17)
 docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21)
+docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25)
 docker.io/jenkins/jenkins:2.534-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
 docker.io/jenkins/jenkins:alpine (alpine_jdk21)
 docker.io/jenkins/jenkins:alpine-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:alpine-jdk21 (alpine_jdk21)
+docker.io/jenkins/jenkins:alpine-jdk25 (alpine_jdk25)
 docker.io/jenkins/jenkins:alpine3.23-jdk17 (alpine_jdk17)
 docker.io/jenkins/jenkins:alpine3.23-jdk21 (alpine_jdk21)
+docker.io/jenkins/jenkins:alpine3.23-jdk25 (alpine_jdk25)
 docker.io/jenkins/jenkins:jdk17 (debian_jdk17)
 docker.io/jenkins/jenkins:jdk17-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk17)
 docker.io/jenkins/jenkins:jdk21 (debian_jdk21)
 docker.io/jenkins/jenkins:jdk21-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
+docker.io/jenkins/jenkins:jdk25 (debian_jdk25)
+docker.io/jenkins/jenkins:jdk25-hotspot-windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk25)
 docker.io/jenkins/jenkins:latest (debian_jdk21)
 docker.io/jenkins/jenkins:latest-jdk17 (debian_jdk17)
 docker.io/jenkins/jenkins:latest-jdk21 (debian_jdk21)
+docker.io/jenkins/jenkins:latest-jdk25 (debian_jdk25)
 docker.io/jenkins/jenkins:rhel-ubi9-jdk17 (rhel_jdk17)
 docker.io/jenkins/jenkins:rhel-ubi9-jdk21 (rhel_jdk21)
+docker.io/jenkins/jenkins:rhel-ubi9-jdk25 (rhel_jdk25)
 docker.io/jenkins/jenkins:slim (debian-slim_jdk21)
 docker.io/jenkins/jenkins:slim-jdk17 (debian-slim_jdk17)
 docker.io/jenkins/jenkins:slim-jdk21 (debian-slim_jdk21)
+docker.io/jenkins/jenkins:slim-jdk25 (debian-slim_jdk25)
 docker.io/jenkins/jenkins:windowsservercore-ltsc2019 (windowsservercore-ltsc2019_jdk21)
diff --git a/windows/windowsservercore/hotspot/Dockerfile b/windows/windowsservercore/hotspot/Dockerfile
@@ -23,23 +23,28 @@ RUN Write-Host 'javac --version' ; javac --version ; `
     Write-Host 'java --version' ; java --version
 
 RUN $version = (jlink --version) ; `
-    $compressArg = '--compress=2' ; `
-    switch ($version.Substring(0,3)) { `
-        '17.' {} `
-        # the compression argument is different for JDK21
-        '21.' { $compressArg = '--compress=zip-6' } `
-        Default { `
-            Write-Error 'ERROR: unmanaged jlink version pattern' ; `
-            exit 1 ; `
+    $javaMajorVersion = $version.Substring(0,2) ; `
+    if ($javaMajorVersion -eq '25') { `
+        $openjdkFolder = 'openjdk-{0}' -f $javaMajorVersion ; `
+        Copy-Item -Path $openjdkFolder -Destination C:\javaruntime -Recurse ; `
+    } else { `
+        $options = '--compress=2' ; `
+        switch ($version.Substring(0,3)) { `
+            '17.' { $options = '--compress=2' } `
+            '21.' { $options = '--compress=zip-6' } `
+            Default { `
+                Write-Error 'ERROR: unmanaged jlink version pattern' ; `
+                exit 1 ; `
+            } `
         } `
-    } `
-    & jlink `
-    --strip-java-debug-attributes `
-    $compressArg `
-    --add-modules ALL-MODULE-PATH `
-    --no-man-pages `
-    --no-header-files `
-    --output /javaruntime
+        & jlink `
+        --strip-java-debug-attributes `
+        $options `
+        --add-modules ALL-MODULE-PATH `
+        --no-man-pages `
+        --no-header-files `
+        --output /javaruntime ; `
+    }
 
 FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION}" AS controller
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`## Variables`
`2`	`2`	`variable "jdks_to_build" {`
`3`		`- default = [17, 21]`
	`3`	`+ default = [17, 21, 25]`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`variable "windows_version_to_build_for_lts" {`
`@@ -67,6 +67,10 @@ variable "JAVA21_VERSION" {`
`67`	`67`	`default = "21.0.9_10"`
`68`	`68`	`}`
`69`	`69`
	`70`	`+variable "JAVA25_VERSION" {`
	`71`	`+ default = "25.0.1_8"`
	`72`	`+}`
	`73`	`+`
`70`	`74`	`variable "DEBIAN_RELEASE_LINE" {`
`71`	`75`	`default = "trixie"`
`72`	`76`	`}`
`@@ -93,6 +97,7 @@ variable "jdk_versions" {`
`93`	`97`	`default = {`
`94`	`98`	`17 = JAVA17_VERSION`
`95`	`99`	`21 = JAVA21_VERSION`
	`100`	`+ 25 = JAVA25_VERSION`
`96`	`101`	`}`
`97`	`102`	`}`
`98`	`103`