Merge branch '2.7.x' into 3.0.x

wilkinsona · wilkinsona · commit d65f1cd704fd · 2023-02-06T13:07:46.000Z
Closes gh-32977
diff --git a/ci/images/ci-image-jdk19/Dockerfile b/ci/images/ci-image-jdk19/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20221019
+FROM ubuntu:jammy-20230126
 
 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:focal-20221019
+FROM ubuntu:jammy-20230126
 
 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:focal-20221019`
	`1`	`+FROM ubuntu:jammy-20230126`
`2`	`2`
`3`	`3`	`ADD setup.sh /setup.sh`
`4`	`4`	`ADD get-jdk-url.sh /get-jdk-url.sh`