Merge branch '3.1.x'

Closes gh-38893
spring-projects · Dec 21, 2023 · 3222458 · 3222458
2 parents f31ffbf + 66e9c77
commit 3222458
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/ci/images/ci-image-jdk21/Dockerfile b/ci/images/ci-image-jdk21/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20231128
+FROM ubuntu:jammy-20231211.1
 
 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
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20231128
+FROM ubuntu:jammy-20231211.1
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh

diff --git a/...ring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile b/...ring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20230624/Dockerfile
@@ -1,10 +1,10 @@
-FROM ubuntu:jammy-20231004 as prepare
+FROM ubuntu:jammy-20231211.1 as prepare
 COPY downloads/* /opt/download/
 RUN mkdir -p /opt/jdk && \
     cd /opt/jdk && \
     tar xzf  /opt/download/* --strip-components=1
 
-FROM ubuntu:jammy-20231004
+FROM ubuntu:jammy-20231211.1
 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/...ests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile b/...ests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20230624
+FROM ubuntu:jammy-20231211.1
 RUN apt-get update && \
     apt-get install -y software-properties-common curl && \
     mkdir -p /opt/oraclejdk && \

diff --git a/...ing-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 b/...ing-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20230624
+FROM ubuntu:jammy-20231211.1
 RUN apt-get update && \
     apt-get install -y software-properties-common curl && \
     mkdir -p /opt/oraclejdk && \

diff --git a/...ration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile b/...ration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile
@@ -1,10 +1,10 @@
-FROM ubuntu:jammy-20231004 as prepare
+FROM ubuntu:jammy-20231211.1 as prepare
 COPY downloads/* /opt/download/
 RUN mkdir -p /opt/jdk && \
     cd /opt/jdk && \
     tar xzf  /opt/download/* --strip-components=1
 
-FROM ubuntu:jammy-20231004
+FROM ubuntu:jammy-20231211.1
 COPY --from=prepare /opt/jdk /opt/jdk
 ENV JAVA_HOME /opt/jdk
 ENV PATH $JAVA_HOME/bin:$PATH