Skip to content

Commit

Permalink
Merge branch '2.5.x' into 2.6.x
Browse files Browse the repository at this point in the history 
Closes gh-30869
  • Loading branch information
@wilkinsona
wilkinsona committed May 5, 2022
2 parents fa327a7 + 09ec409 commit 366dd9a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ci/images/ci-image-jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal-20220415
FROM ubuntu:focal-20220426

ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
Expand Down
2 changes: 1 addition & 1 deletion ci/images/ci-image-jdk17/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal-20220415
FROM ubuntu:focal-20220426

ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
Expand Down
2 changes: 1 addition & 1 deletion ci/images/ci-image-jdk18/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal-20220415
FROM ubuntu:focal-20220426

ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
Expand Down
2 changes: 1 addition & 1 deletion ci/images/ci-image/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal-20220415
FROM ubuntu:focal-20220426

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

0 comments on commit 366dd9a

Please sign in to comment.