Merge branch '3.1.x' into 3.2.x

scottfrederick · scottfrederick · commit 8d16a53452de · 2024-01-17T16:36:49.000-06:00
Closes gh-39222
diff --git a/ci/images/ci-image-jdk21/Dockerfile b/ci/images/ci-image-jdk21/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20231211.1
+FROM ubuntu:jammy-20240111
 
 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-20231211.1
+FROM ubuntu:jammy-20240111
 
 ADD setup.sh /setup.sh
 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-20231211.1`
	`1`	`+FROM ubuntu:jammy-20240111`
`2`	`2`
`3`	`3`	`ADD setup.sh /setup.sh`
`4`	`4`	`ADD get-jdk-url.sh /get-jdk-url.sh`