From c7d6fbcb3ad04461bc8d1b672b0cc8d137773cc7 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Oct 2023 21:10:00 -0700 Subject: [PATCH 1/4] Upgrade to Ubuntu Jammy 20231004 See gh-37954 --- .../intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile | 4 ++-- .../src/intTest/resources/conf/oracle-jdk-17/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile index 4e9da10f8ff..9aa2d4f2bbe 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:jammy-20230624 as prepare +FROM ubuntu:jammy-20231004 as prepare COPY downloads/* /opt/download/ RUN mkdir -p /opt/jdk && \ cd /opt/jdk && \ tar xzf /opt/download/* --strip-components=1 -FROM ubuntu:jammy-20230624 +FROM ubuntu:jammy-20231004 RUN apt-get update && apt-get install -y software-properties-common curl COPY --from=prepare /opt/jdk /opt/jdk ENV JAVA_HOME /opt/jdk diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile index 0b920d47fde..594958d179a 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:jammy-20230624 as prepare +FROM ubuntu:jammy-20231004 as prepare COPY downloads/* /opt/download/ RUN mkdir -p /opt/jdk && \ cd /opt/jdk && \ tar xzf /opt/download/* --strip-components=1 -FROM ubuntu:jammy-20230624 +FROM ubuntu:jammy-20231004 COPY --from=prepare /opt/jdk /opt/jdk ENV JAVA_HOME /opt/jdk ENV PATH $JAVA_HOME/bin:$PATH From 812023a84b02b3aa055e079d8801a61c4d543ca3 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Oct 2023 21:13:42 -0700 Subject: [PATCH 2/4] Upgrade to Ubuntu Jammy 20231004 Closes gh-37952 --- ci/images/ci-image-jdk21/Dockerfile | 2 +- ci/images/ci-image/Dockerfile | 2 +- .../intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile | 4 ++-- .../src/intTest/resources/conf/oracle-jdk-17/Dockerfile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/images/ci-image-jdk21/Dockerfile b/ci/images/ci-image-jdk21/Dockerfile index 67f9f17acea..43d49da92ff 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 437744c9515..20a0cdff320 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 diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile index 4e9da10f8ff..9aa2d4f2bbe 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:jammy-20230624 as prepare +FROM ubuntu:jammy-20231004 as prepare COPY downloads/* /opt/download/ RUN mkdir -p /opt/jdk && \ cd /opt/jdk && \ tar xzf /opt/download/* --strip-components=1 -FROM ubuntu:jammy-20230624 +FROM ubuntu:jammy-20231004 RUN apt-get update && apt-get install -y software-properties-common curl COPY --from=prepare /opt/jdk /opt/jdk ENV JAVA_HOME /opt/jdk diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile index 0b920d47fde..594958d179a 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:jammy-20230624 as prepare +FROM ubuntu:jammy-20231004 as prepare COPY downloads/* /opt/download/ RUN mkdir -p /opt/jdk && \ cd /opt/jdk && \ tar xzf /opt/download/* --strip-components=1 -FROM ubuntu:jammy-20230624 +FROM ubuntu:jammy-20231004 COPY --from=prepare /opt/jdk /opt/jdk ENV JAVA_HOME /opt/jdk ENV PATH $JAVA_HOME/bin:$PATH From 53d04973e4a1c2e673a80524ffa2448896da071b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Oct 2023 21:14:54 -0700 Subject: [PATCH 3/4] Upgrade to Java 17.0.9+11 See gh-37951 --- 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 f3492b9b9f2..85ec0fe79eb 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -3,7 +3,7 @@ set -e case "$1" in 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 e778355bd709949c9782ada7059929c361ab6f9a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Oct 2023 21:15:45 -0700 Subject: [PATCH 4/4] Upgrade to Java 21.0.1+12 Closes gh-37953 --- 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 85ec0fe79eb..db11e34f609 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/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"