Merge branch '2.1.x' into 2.2.x

Closes gh-21260
This commit is contained in:
Stephane Nicoll 2020-05-04 15:02:17 +02:00
commit 487329fafa
3 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic-20200311 FROM ubuntu:bionic-20200403
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh

View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic-20200311 FROM ubuntu:bionic-20200403
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh

View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic-20200311 FROM ubuntu:bionic-20200403
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh