Merge branch 'lts' into lts-with-plugins

MarkEWaite · Jul 22, 2024 · 1964eaa · 1964eaa
2 parents 69d115f + d76e9a0
commit 1964eaa
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/alpine/hotspot/Dockerfile b/alpine/hotspot/Dockerfile
@@ -2,7 +2,7 @@ ARG ALPINE_TAG=3.20.1
 
 FROM alpine:"${ALPINE_TAG}" AS jre-build
 
-ARG JAVA_VERSION=17.0.11_9
+ARG JAVA_VERSION=17.0.12_7
 
 SHELL ["/bin/ash", "-o", "pipefail", "-c"]
 

diff --git a/build-windows-lts-with-jdk11.yaml b/build-windows-lts-with-jdk11.yaml
@@ -22,7 +22,7 @@ services:
       args:
         COMMIT_SHA: ${COMMIT_SHA}
         JAVA_HOME: "C:/openjdk-17"
-        JAVA_VERSION: 17.0.11_9
+        JAVA_VERSION: 17.0.12_7
         JENKINS_SHA: ${JENKINS_SHA}
         JENKINS_VERSION: ${JENKINS_VERSION}
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
@@ -39,7 +39,7 @@ services:
       args:
         COMMIT_SHA: ${COMMIT_SHA}
         JAVA_HOME: "C:/openjdk-21"
-        JAVA_VERSION: 21.0.3_9
+        JAVA_VERSION: 21.0.4_7
         JENKINS_SHA: ${JENKINS_SHA}
         JENKINS_VERSION: ${JENKINS_VERSION}
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}

diff --git a/build-windows.yaml b/build-windows.yaml
@@ -7,7 +7,7 @@ services:
       args:
         COMMIT_SHA: ${COMMIT_SHA}
         JAVA_HOME: "C:/openjdk-17"
-        JAVA_VERSION: 17.0.11_9
+        JAVA_VERSION: 17.0.12_7
         JENKINS_SHA: ${JENKINS_SHA}
         JENKINS_VERSION: ${JENKINS_VERSION}
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
@@ -24,7 +24,7 @@ services:
       args:
         COMMIT_SHA: ${COMMIT_SHA}
         JAVA_HOME: "C:/openjdk-21"
-        JAVA_VERSION: 21.0.3_9
+        JAVA_VERSION: 21.0.4_7
         JENKINS_SHA: ${JENKINS_SHA}
         JENKINS_VERSION: ${JENKINS_VERSION}
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}

diff --git a/debian/bookworm-slim/hotspot/Dockerfile b/debian/bookworm-slim/hotspot/Dockerfile
@@ -2,7 +2,7 @@ ARG BOOKWORM_TAG=20240701
 
 FROM debian:bookworm-"${BOOKWORM_TAG}"-slim as jre-build
 
-ARG JAVA_VERSION=17.0.11_9
+ARG JAVA_VERSION=17.0.12_7
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/debian/bookworm/hotspot/Dockerfile b/debian/bookworm/hotspot/Dockerfile
@@ -2,7 +2,7 @@ ARG BOOKWORM_TAG=20240701
 
 FROM debian:bookworm-"${BOOKWORM_TAG}" as jre-build
 
-ARG JAVA_VERSION=17.0.11_9
+ARG JAVA_VERSION=17.0.12_7
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -112,11 +112,11 @@ variable "JAVA11_VERSION" {
 }
 
 variable "JAVA17_VERSION" {
-  default = "17.0.11_9"
+  default = "17.0.12_7"
 }
 
 variable "JAVA21_VERSION" {
-  default = "21.0.3_9"
+  default = "21.0.4_7"
 }
 
 variable "BOOKWORM_TAG" {

diff --git a/rhel/ubi9/hotspot/Dockerfile b/rhel/ubi9/hotspot/Dockerfile
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi9/ubi:9.4-1123.1719560047 as jre-build
 
-ARG JAVA_VERSION=17.0.11_9
+ARG JAVA_VERSION=17.0.12_7
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/windows/windowsservercore/hotspot/Dockerfile b/windows/windowsservercore/hotspot/Dockerfile
@@ -1,7 +1,7 @@
 # escape=`
 # hadolint shell=powershell
 
-ARG JAVA_VERSION=17.0.11_9
+ARG JAVA_VERSION=17.0.12_7
 ARG WINDOWS_VERSION=ltsc2019
 ARG TOOLS_WINDOWS_VERSION=1809
 
@@ -10,7 +10,7 @@ FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION}" AS jre-build
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG JAVA_VERSION=17.0.11_9
+ARG JAVA_VERSION=17.0.12_7
 
 RUN New-Item -ItemType Directory -Path C:\temp | Out-Null ; `
     $javaMajorVersion = $env:JAVA_VERSION.substring(0,2) ; `