Merge branch '2.6.x' into 2.7.x

Closes gh-30868
pull/31139/head
Andy Wilkinson 3 years ago
commit 3717b558a0

@ -1,4 +1,4 @@
FROM ubuntu:focal-20220415 FROM ubuntu:focal-20220426
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

@ -1,4 +1,4 @@
FROM ubuntu:focal-20220415 FROM ubuntu:focal-20220426
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

@ -1,4 +1,4 @@
FROM ubuntu:focal-20220415 FROM ubuntu:focal-20220426
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

@ -1,4 +1,4 @@
FROM ubuntu:focal-20220415 FROM ubuntu:focal-20220426
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

Loading…
Cancel
Save