Merge branch 'master' into only-run-actions-in-jenkinsci-org

MarkEWaite · Jan 27, 2024 · 2830f53 · 2830f53
2 parents d14fa80 + 195b6b0
commit 2830f53
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 32 deletions.
diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.53.0
+        uses: updatecli/updatecli-action@v2.54.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml

diff --git a/11/almalinux/almalinux8/hotspot/Dockerfile b/11/almalinux/almalinux8/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 FROM almalinux:8.9 as jre-build
-ARG JAVA_VERSION=11.0.21_9
+ARG JAVA_VERSION=11.0.22_7
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/11/alpine/hotspot/Dockerfile b/11/alpine/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG ALPINE_TAG=3.19.0
-ARG JAVA_VERSION=11.0.21_9
+ARG JAVA_VERSION=11.0.22_7
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-alpine AS jre-build
 
 # Generate smaller java runtime without unneeded files

diff --git a/11/debian/bookworm-slim/hotspot/Dockerfile b/11/debian/bookworm-slim/hotspot/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION=11.0.21_9
+ARG JAVA_VERSION=11.0.22_7
 ARG BOOKWORM_TAG=20240110
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy as jre-build
 

diff --git a/11/debian/bookworm/hotspot/Dockerfile b/11/debian/bookworm/hotspot/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION=11.0.21_9
+ARG JAVA_VERSION=11.0.22_7
 ARG BOOKWORM_TAG=20240110
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy as jre-build
 

diff --git a/11/rhel/ubi8/hotspot/Dockerfile b/11/rhel/ubi8/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 FROM registry.access.redhat.com/ubi8/ubi:8.9-1107.1705420509 as jre-build
-ARG JAVA_VERSION=11.0.21_9
+ARG JAVA_VERSION=11.0.22_7
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

diff --git a/17/alpine/hotspot/Dockerfile b/17/alpine/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG ALPINE_TAG=3.18.4
-ARG JAVA_VERSION=17.0.9_9
+ARG JAVA_VERSION=17.0.10_7
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-alpine AS jre-build
 
 # Generate smaller java runtime without unneeded files

diff --git a/17/debian/bookworm-slim/hotspot/Dockerfile b/17/debian/bookworm-slim/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG BOOKWORM_TAG=20240110
-ARG JAVA_VERSION=17.0.9_9
+ARG JAVA_VERSION=17.0.10_7
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy as jre-build
 
 RUN jlink \

diff --git a/17/debian/bookworm/hotspot/Dockerfile b/17/debian/bookworm/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG BOOKWORM_TAG=20240110
-ARG JAVA_VERSION=17.0.9_9
+ARG JAVA_VERSION=17.0.10_7
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy as jre-build
 
 RUN jlink \

diff --git a/17/rhel/ubi9/hotspot/Dockerfile b/17/rhel/ubi9/hotspot/Dockerfile
@@ -1,4 +1,4 @@
-ARG JAVA_VERSION=17.0.9_9
+ARG JAVA_VERSION=17.0.10_7
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-ubi9-minimal as jre-build
 
 # Generate smaller java runtime without unneeded files
@@ -10,7 +10,7 @@ RUN jlink \
          --compress=2 \
          --output /javaruntime
 
-FROM registry.access.redhat.com/ubi9/ubi:9.3-1476
+FROM registry.access.redhat.com/ubi9/ubi:9.3-1552
 
 ENV LANG C.UTF-8
 

diff --git a/21/alpine/hotspot/Dockerfile b/21/alpine/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG ALPINE_TAG=3.19.0
-ARG JAVA_VERSION=21.0.1_12
+ARG JAVA_VERSION=21.0.2_13
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-alpine AS jre-build
 
 # Generate smaller java runtime without unneeded files

diff --git a/21/debian/bookworm-slim/hotspot/Dockerfile b/21/debian/bookworm-slim/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG BOOKWORM_TAG=20240110
-ARG JAVA_VERSION=21.0.1_12
+ARG JAVA_VERSION=21.0.2_13
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy as jre-build
 
 RUN if test "${TARGETPLATFORM}" != 'linux/arm/v7'; then \

diff --git a/21/debian/bookworm-slim/hotspot/preview/Dockerfile b/21/debian/bookworm-slim/hotspot/preview/Dockerfile
@@ -1,6 +1,6 @@
 ARG BOOKWORM_TAG=20240110
 FROM debian:bookworm-"${BOOKWORM_TAG}"-slim as jre-build
-ARG JAVA_VERSION=21.0.1_12
+ARG JAVA_VERSION=21.0.2_13
 ARG TARGETPLATFORM
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/21/debian/bookworm/hotspot/Dockerfile b/21/debian/bookworm/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 ARG BOOKWORM_TAG=20240110
-ARG JAVA_VERSION=21.0.1_12
+ARG JAVA_VERSION=21.0.2_13
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-jammy as jre-build
 
 RUN if test "${TARGETPLATFORM}" != 'linux/arm/v7'; then \

diff --git a/21/debian/bookworm/hotspot/preview/Dockerfile b/21/debian/bookworm/hotspot/preview/Dockerfile
@@ -1,6 +1,6 @@
 ARG BOOKWORM_TAG=20240110
 FROM debian:bookworm-"${BOOKWORM_TAG}"-slim as jre-build
-ARG JAVA_VERSION=21.0.1_12
+ARG JAVA_VERSION=21.0.2_13
 ARG TARGETPLATFORM
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/21/rhel/ubi9/hotspot/Dockerfile b/21/rhel/ubi9/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 FROM registry.access.redhat.com/ubi9/ubi:9.3-1361 as jre-build
-ARG JAVA_VERSION=21.0.1_12
+ARG JAVA_VERSION=21.0.2_13
 ARG TARGETPLATFORM
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/build-windows.yaml b/build-windows.yaml
@@ -7,7 +7,7 @@ services:
       args:
         COMMIT_SHA: ${COMMIT_SHA}
         JAVA_HOME: "C:/openjdk-11"
-        JAVA_VERSION: "11.0.21_9"
+        JAVA_VERSION: "11.0.22_7"
         JENKINS_SHA: ${JENKINS_SHA}
         JENKINS_VERSION: ${JENKINS_VERSION}
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
@@ -22,7 +22,7 @@ services:
       args:
         COMMIT_SHA: ${COMMIT_SHA}
         JAVA_HOME: "C:/openjdk-17"
-        JAVA_VERSION: "17.0.9_9"
+        JAVA_VERSION: "17.0.10_7"
         JENKINS_SHA: ${JENKINS_SHA}
         JENKINS_VERSION: ${JENKINS_VERSION}
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -90,11 +90,11 @@ variable "ALPINE_SHORT_TAG" {
 }
 
 variable "JAVA11_VERSION" {
-  default = "11.0.21_9"
+  default = "11.0.22_7"
 }
 
 variable "JAVA17_VERSION" {
-  default = "17.0.9_9"
+  default = "17.0.10_7"
 }
 
 # not passed through currently as inconsistent versions are published (2023-08-14)
@@ -104,7 +104,7 @@ variable "JAVA21_PREVIEW_VERSION" {
 }
 
 variable "JAVA21_VERSION" {
-  default = "21.0.1_12"
+  default = "21.0.2_13"
 }
 
 variable "BOOKWORM_TAG" {

diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml
@@ -126,15 +126,6 @@ targets:
         keyword: ARG
         matcher: JAVA_VERSION
     scmid: default
-  setJDK17VersionWindows:
-    name: "Bump JDK17 version for Linux images in the Windows Dockerfile"
-    kind: dockerfile
-    spec:
-      file: 17/windows/windowsservercore-2019/hotspot/Dockerfile
-      instruction:
-        keyword: ARG
-        matcher: JAVA_VERSION
-    scmid: default
 
 actions:
   default:

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.9_9
+ARG JAVA_VERSION=17.0.10_7
 ARG WINDOWS_VERSION=ltsc2019
 ARG TOOLS_WINDOWS_VERSION=1809
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-windowsservercore-"${TOOLS_WINDOWS_VERSION}" AS jdk-core