Merge branch '2.5.x' into 2.6.x

Closes gh-30816
2022-04-28 09:52:50 +01:00
parent bf94ea24d3 8eb9ddd063
commit 0b6a3e7ec6
4 changed files with 4 additions and 4 deletions
--- a/ci/images/ci-image-jdk11/Dockerfile
+++ b/ci/images/ci-image-jdk11/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20220404
+FROM ubuntu:focal-20220415

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
--- a/ci/images/ci-image-jdk17/Dockerfile
+++ b/ci/images/ci-image-jdk17/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20220404
+FROM ubuntu:focal-20220415

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
--- a/ci/images/ci-image-jdk18/Dockerfile
+++ b/ci/images/ci-image-jdk18/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20220404
+FROM ubuntu:focal-20220415

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20220404
+FROM ubuntu:focal-20220415

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