From d60cf65d9b79e1f066b0504df73b85be9242b630 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Wed, 24 Aug 2022 20:46:28 -0600 Subject: [PATCH] Use JDK 17.0.4.1 instead of JDK 17.0.4 From https://www.jenkins.io/doc/upgrade-guide/2.346/#upgrading-to-jenkins-lts-2-346-3 OpenJDK 11.0.16/17.0.4 and the C2 JIT compiler OpenJDK 11.0.16 and 17.0.4 are susceptible to JDK-8292260, a regression in the C2 JIT compiler which may cause the JVM to crash unpredictably. The OpenJDK project has released fixes in 11.0.16.1 and 17.0.4.1. OpenJDK 11.0.16/17.0.4 and the metaspace The version of OpenJDK in the official Docker image has been upgraded from 11.0.15 to 11.0.16 and from 17.0.3 to 17.0.4. This exposes a metaspace memory leak in Pipeline: Groovy 2692.v76b_089ccd026 and earlier and in Script Security 1172.v35f6a_0b_8207e and earlier. After upgrading Jenkins to 2.346.3, upgrade Pipeline: Groovy to 2705.v0449852ee36f or later and upgrade Script Security to 1175.v4b_d517d6db_f0 or later. It is generally recommended to upgrade all plugins after upgrading Jenkins core. --- 17/alpine/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/windows/nanoserver-1809/Dockerfile | 2 +- 17/windows/windowsservercore-ltsc2019/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/17/alpine/Dockerfile b/17/alpine/Dockerfile index 5986104e7..f6a418f81 100644 --- a/17/alpine/Dockerfile +++ b/17/alpine/Dockerfile @@ -19,7 +19,7 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ARG JAVA_VERSION="17.0.4_8" +ARG JAVA_VERSION="17.0.4.1_1" FROM eclipse-temurin:${JAVA_VERSION}-jdk-alpine ARG VERSION=4.13 diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 8ece7e930..16cf0b9f0 100644 --- a/17/bullseye/Dockerfile +++ b/17/bullseye/Dockerfile @@ -21,7 +21,7 @@ # THE SOFTWARE. # To avoid "jmods: Value too large for defined data type" error, -FROM --platform=$BUILDPLATFORM eclipse-temurin:17.0.4_8-jdk-focal AS jre-build +FROM --platform=$BUILDPLATFORM eclipse-temurin:17.0.4.1_1-jdk-focal AS jre-build # Generate smaller java runtime without unneeded files # for now we include the full module path to maintain compatibility diff --git a/17/windows/nanoserver-1809/Dockerfile b/17/windows/nanoserver-1809/Dockerfile index b6109fc5f..d7572fa57 100644 --- a/17/windows/nanoserver-1809/Dockerfile +++ b/17/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ARG JAVA_VERSION="17.0.4_8" +ARG JAVA_VERSION="17.0.4.1_1" FROM eclipse-temurin:${JAVA_VERSION}-jdk-windowsservercore-1809 AS core # If you pass in a POWERSHELL_VERSION, make sure it ends with a hyphen, leaving it empty will diff --git a/17/windows/windowsservercore-ltsc2019/Dockerfile b/17/windows/windowsservercore-ltsc2019/Dockerfile index d52a3cf30..844f3f785 100644 --- a/17/windows/windowsservercore-ltsc2019/Dockerfile +++ b/17/windows/windowsservercore-ltsc2019/Dockerfile @@ -22,7 +22,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -FROM eclipse-temurin:17.0.4_8-jdk-windowsservercore-1809 +FROM eclipse-temurin:17.0.4.1_1-jdk-windowsservercore-1809 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]