Merge branch '2.1.x' into 2.2.x

snicoll · snicoll · commit 487329fafaee · 2020-05-04T15:02:17.000+02:00
Closes gh-21260
diff --git a/ci/images/spring-boot-ci-image/Dockerfile b/ci/images/spring-boot-ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200311
+FROM ubuntu:bionic-20200403
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
diff --git a/ci/images/spring-boot-jdk11-ci-image/Dockerfile b/ci/images/spring-boot-jdk11-ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200311
+FROM ubuntu:bionic-20200403
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
diff --git a/ci/images/spring-boot-jdk14-ci-image/Dockerfile b/ci/images/spring-boot-jdk14-ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200311
+FROM ubuntu:bionic-20200403
 
 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-20200311`
	`1`	`+FROM ubuntu:bionic-20200403`
`2`	`2`
`3`	`3`	`ADD setup.sh /setup.sh`
`4`	`4`	`ADD get-jdk-url.sh /get-jdk-url.sh`