Merge branch '2.1.x' into 2.2.x

See gh-20567
2020-03-19 15:29:20 +01:00 · 2020-03-19 15:29:20 +01:00 · 833f0a1db3
parent 168326d9e4 d0ccb59931
commit 833f0a1db3
4 changed files with 4 additions and 4 deletions
--- 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-20200219

 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 @@
-FROM ubuntu:bionic-20200311
+FROM ubuntu:bionic-20200219

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
--- a/ci/images/spring-boot-jdk13-ci-image/Dockerfile
+++ b/ci/images/spring-boot-jdk13-ci-image/Dockerfile
@ -1,4 +1,4 @@
-FROM ubuntu:bionic-20200311
+FROM ubuntu:bionic-20200219

 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 @@
-FROM ubuntu:bionic-20200311
+FROM ubuntu:bionic-20200219

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh