Merge branch '2.2.x' into 2.3.x

wilkinsona · wilkinsona · commit 223b4e4a6fa1 · 2021-01-28T09:02:45.000Z
Closes gh-25021
diff --git a/ci/images/ci-image-jdk11/Dockerfile b/ci/images/ci-image-jdk11/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20201106
+FROM ubuntu:focal-20210119
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
diff --git a/ci/images/ci-image-jdk15/Dockerfile b/ci/images/ci-image-jdk15/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20201106
+FROM ubuntu:focal-20210119
 
 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-20201106
+FROM ubuntu:focal-20210119
 
 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-20201106`
	`1`	`+FROM ubuntu:focal-20210119`
`2`	`2`
`3`	`3`	`ADD setup.sh /setup.sh`
`4`	`4`	`ADD get-jdk-url.sh /get-jdk-url.sh`