From 9a4e16a2d4ce46a85623bd802d78921bbcc2b31e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Oct 2023 20:56:02 -0700 Subject: [PATCH 1/5] Upgrade to Ubuntu Jammy 20231004 in CI images #37954 Closes gh-37954 --- ci/images/ci-image-jdk11/Dockerfile | 2 +- ci/images/ci-image-jdk17/Dockerfile | 2 +- ci/images/ci-image-jdk21/Dockerfile | 2 +- ci/images/ci-image/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/images/ci-image-jdk11/Dockerfile b/ci/images/ci-image-jdk11/Dockerfile index 450d3440e43..7647212f7f9 100644 --- a/ci/images/ci-image-jdk11/Dockerfile +++ b/ci/images/ci-image-jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20230916 +FROM ubuntu:jammy-20231004 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image-jdk17/Dockerfile b/ci/images/ci-image-jdk17/Dockerfile index d5c2214400a..10f56d827c2 100644 --- a/ci/images/ci-image-jdk17/Dockerfile +++ b/ci/images/ci-image-jdk17/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20230916 +FROM ubuntu:jammy-20231004 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image-jdk21/Dockerfile b/ci/images/ci-image-jdk21/Dockerfile index 54582bd5a80..74d26912403 100644 --- a/ci/images/ci-image-jdk21/Dockerfile +++ b/ci/images/ci-image-jdk21/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20230916 +FROM ubuntu:jammy-20231004 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index 21aeb70510d..9e0be060634 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20230916 +FROM ubuntu:jammy-20231004 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh From 62a074a728451889b4973236b745050674814e46 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Oct 2023 21:01:09 -0700 Subject: [PATCH 2/5] Upgrade to Java 8u392+9 See gh-37950 --- ci/images/get-jdk-url.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index ee495bb70e9..2c1d2d4ad1b 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -3,7 +3,7 @@ set -e case "$1" in java8) - echo "https://github.com/bell-sw/Liberica/releases/download/8u382+6/bellsoft-jdk8u382+6-linux-amd64.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/8u392+9/bellsoft-jdk8u392+9-linux-amd64.tar.gz" ;; java11) echo "https://github.com/bell-sw/Liberica/releases/download/11.0.20.1+1/bellsoft-jdk11.0.20.1+1-linux-amd64.tar.gz" From ad933869cae0fb2e83a263106e5820b860bc775d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Oct 2023 21:02:15 -0700 Subject: [PATCH 3/5] Upgrade to Java 11.0.21+10 Closes gh-37946 --- ci/images/get-jdk-url.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 2c1d2d4ad1b..131ef2486ab 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -6,7 +6,7 @@ case "$1" in echo "https://github.com/bell-sw/Liberica/releases/download/8u392+9/bellsoft-jdk8u392+9-linux-amd64.tar.gz" ;; java11) - echo "https://github.com/bell-sw/Liberica/releases/download/11.0.20.1+1/bellsoft-jdk11.0.20.1+1-linux-amd64.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/11.0.21+10/bellsoft-jdk11.0.21+10-linux-amd64.tar.gz" ;; java17) echo "https://github.com/bell-sw/Liberica/releases/download/17.0.8.1+1/bellsoft-jdk17.0.8.1+1-linux-amd64.tar.gz" From d226ba88d94877d7c90fd8881876bd3af1927f4f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Oct 2023 21:02:55 -0700 Subject: [PATCH 4/5] Upgrade to Java 17.0.9+11 Closes gh-37947 --- ci/images/get-jdk-url.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 131ef2486ab..07cf194c72d 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -9,7 +9,7 @@ case "$1" in echo "https://github.com/bell-sw/Liberica/releases/download/11.0.21+10/bellsoft-jdk11.0.21+10-linux-amd64.tar.gz" ;; java17) - echo "https://github.com/bell-sw/Liberica/releases/download/17.0.8.1+1/bellsoft-jdk17.0.8.1+1-linux-amd64.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/17.0.9+11/bellsoft-jdk17.0.9+11-linux-amd64.tar.gz" ;; java21) echo "https://github.com/bell-sw/Liberica/releases/download/21+37/bellsoft-jdk21+37-linux-amd64.tar.gz" From b226ff40f09710d3eee87c4b9f099628c14e4512 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Oct 2023 21:03:47 -0700 Subject: [PATCH 5/5] Upgrade to Java 21.0.1+12 Closes gh-37948 --- ci/images/get-jdk-url.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 07cf194c72d..7370221ef0d 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -12,7 +12,7 @@ case "$1" in echo "https://github.com/bell-sw/Liberica/releases/download/17.0.9+11/bellsoft-jdk17.0.9+11-linux-amd64.tar.gz" ;; java21) - echo "https://github.com/bell-sw/Liberica/releases/download/21+37/bellsoft-jdk21+37-linux-amd64.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/21.0.1+12/bellsoft-jdk21.0.1+12-linux-amd64.tar.gz" ;; *) echo $"Unknown java version"