Merge branch '2.1.x' into 2.2.x

Closes gh-21260
6 years ago · 487329fafa
3 changed files with 3 additions and 3 deletions
--- a/ci/images/spring-boot-ci-image/Dockerfile
+++ b/ci/images/spring-boot-ci-image/Dockerfile
@ -1,4 +1,4 @@
				@@ -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
--- a/ci/images/spring-boot-jdk11-ci-image/Dockerfile
+++ b/ci/images/spring-boot-jdk11-ci-image/Dockerfile
@ -1,4 +1,4 @@
				@@ -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
--- a/ci/images/spring-boot-jdk14-ci-image/Dockerfile
+++ b/ci/images/spring-boot-jdk14-ci-image/Dockerfile
@ -1,4 +1,4 @@
				@@ -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