Merge branch '2.1.x' into 2.2.x

wilkinsona · wilkinsona · commit 11e68717f98c · 2020-09-24T09:17:24.000+01:00
Closes gh-23473
diff --git a/ci/images/ci-image-jdk11/Dockerfile b/ci/images/ci-image-jdk11/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200807
+FROM ubuntu:bionic-20200903
 
 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:bionic-20200807
+FROM ubuntu:bionic-20200903
 
 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:bionic-20200807
+FROM ubuntu:bionic-20200903
 
 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:bionic-20200807`
	`1`	`+FROM ubuntu:bionic-20200903`
`2`	`2`
`3`	`3`	`ADD setup.sh /setup.sh`
`4`	`4`	`ADD get-jdk-url.sh /get-jdk-url.sh`