Merge branch '3.1.x'

philwebb · philwebb · commit 3222458007b6 · 2023-12-20T18:22:15.000-08:00
Closes gh-38893
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/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-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/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/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/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile-aarch64 b/spring-boot-tests/spring-boot-integration-tests/spring-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/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-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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:jammy-20231128`
	`1`	`+FROM ubuntu:jammy-20231211.1`
`2`	`2`
`3`	`3`	`ADD setup.sh /setup.sh`
`4`	`4`	`ADD get-jdk-url.sh /get-jdk-url.sh`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:jammy-20230624`
	`1`	`+FROM ubuntu:jammy-20231211.1`
`2`	`2`	`RUN apt-get update && \`
`3`	`3`	`apt-get install -y software-properties-common curl && \`
`4`	`4`	`mkdir -p /opt/oraclejdk && \`