Merge branch '3.0.x' into 3.1.x

wilkinsona · wilkinsona · commit ea91b2f861e3 · 2023-07-06T12:30:09.000+01:00
Closes gh-36247
diff --git a/ci/images/ci-image-jdk20/Dockerfile b/ci/images/ci-image-jdk20/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20230605
+FROM ubuntu:jammy-20230624
 
 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-20230605
+FROM ubuntu:jammy-20230624
 
 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-20230605`
	`1`	`+FROM ubuntu:jammy-20230624`
`2`	`2`
`3`	`3`	`ADD setup.sh /setup.sh`
`4`	`4`	`ADD get-jdk-url.sh /get-jdk-url.sh`