Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AdoptOpenJDK: Add Java 16 images. #9853

Merged
merged 1 commit into from
Mar 25, 2021
Merged

AdoptOpenJDK: Add Java 16 images. #9853

merged 1 commit into from
Mar 25, 2021

Conversation

dinogun
Copy link
Contributor

@dinogun dinogun commented Mar 25, 2021

Also changing maintainer to @gdams

@github-actions
Copy link

Diff for a62b3b0: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7c7da48..15039df 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,17 +1,17 @@
-Maintainers: Dinakar Guniguntala <dinakar.g@in.ibm.com> (@dinogun)
+Maintainers: George Adams <george.adams@microsoft.com> (@gdams_)
 GitRepo: https://github.com/AdoptOpenJDK/openjdk-docker.git
 
 Tags: 8u282-b08-jdk-hotspot-focal, 8-jdk-hotspot-focal, 8-hotspot-focal
 SharedTags: 8u282-b08-jdk-hotspot, 8-jdk-hotspot, 8-hotspot, 8-jdk, 8
 Architectures: amd64, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
 Tags: 8u282-b08-jdk-hotspot-windowsservercore-1809, 8-jdk-hotspot-windowsservercore-1809, 8-hotspot-windowsservercore-1809
 SharedTags: 8u282-b08-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u282-b08-jdk-hotspot, 8-jdk-hotspot, 8-hotspot, 8-jdk, 8
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
@@ -19,7 +19,7 @@ Constraints: windowsservercore-1809
 Tags: 8u282-b08-jdk-hotspot-windowsservercore-ltsc2016, 8-jdk-hotspot-windowsservercore-ltsc2016, 8-hotspot-windowsservercore-ltsc2016
 SharedTags: 8u282-b08-jdk-hotspot-windowsservercore, 8-jdk-hotspot-windowsservercore, 8-hotspot-windowsservercore, 8u282-b08-jdk-hotspot, 8-jdk-hotspot, 8-hotspot, 8-jdk, 8
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
@@ -27,14 +27,14 @@ Constraints: windowsservercore-ltsc2016
 Tags: 8u282-b08-jdk-openj9-0.24.0-focal, 8-jdk-openj9-focal, 8-openj9-focal
 SharedTags: 8u282-b08-jdk-openj9-0.24.0, 8-jdk-openj9, 8-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
 Tags: 8u282-b08-jdk-openj9-0.24.0-windowsservercore-1809, 8-jdk-openj9-windowsservercore-1809, 8-openj9-windowsservercore-1809
 SharedTags: 8u282-b08-jdk-openj9-0.24.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u282-b08-jdk-openj9-0.24.0, 8-jdk-openj9, 8-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
@@ -42,7 +42,7 @@ Constraints: windowsservercore-1809
 Tags: 8u282-b08-jdk-openj9-0.24.0-windowsservercore-ltsc2016, 8-jdk-openj9-windowsservercore-ltsc2016, 8-openj9-windowsservercore-ltsc2016
 SharedTags: 8u282-b08-jdk-openj9-0.24.0-windowsservercore, 8-jdk-openj9-windowsservercore, 8-openj9-windowsservercore, 8u282-b08-jdk-openj9-0.24.0, 8-jdk-openj9, 8-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
@@ -50,14 +50,14 @@ Constraints: windowsservercore-ltsc2016
 Tags: 8u282-b08-jre-hotspot-focal, 8-jre-hotspot-focal
 SharedTags: 8u282-b08-jre-hotspot, 8-jre-hotspot, 8-jre
 Architectures: amd64, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
 Tags: 8u282-b08-jre-hotspot-windowsservercore-1809, 8-jre-hotspot-windowsservercore-1809
 SharedTags: 8u282-b08-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u282-b08-jre-hotspot, 8-jre-hotspot, 8-jre
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
@@ -65,7 +65,7 @@ Constraints: windowsservercore-1809
 Tags: 8u282-b08-jre-hotspot-windowsservercore-ltsc2016, 8-jre-hotspot-windowsservercore-ltsc2016
 SharedTags: 8u282-b08-jre-hotspot-windowsservercore, 8-jre-hotspot-windowsservercore, 8u282-b08-jre-hotspot, 8-jre-hotspot, 8-jre
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
@@ -73,14 +73,14 @@ Constraints: windowsservercore-ltsc2016
 Tags: 8u282-b08-jre-openj9-0.24.0-focal, 8-jre-openj9-focal
 SharedTags: 8u282-b08-jre-openj9-0.24.0, 8-jre-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
 Tags: 8u282-b08-jre-openj9-0.24.0-windowsservercore-1809, 8-jre-openj9-windowsservercore-1809
 SharedTags: 8u282-b08-jre-openj9-0.24.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u282-b08-jre-openj9-0.24.0, 8-jre-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
@@ -88,7 +88,7 @@ Constraints: windowsservercore-1809
 Tags: 8u282-b08-jre-openj9-0.24.0-windowsservercore-ltsc2016, 8-jre-openj9-windowsservercore-ltsc2016
 SharedTags: 8u282-b08-jre-openj9-0.24.0-windowsservercore, 8-jre-openj9-windowsservercore, 8u282-b08-jre-openj9-0.24.0, 8-jre-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 8/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
@@ -96,14 +96,14 @@ Constraints: windowsservercore-ltsc2016
 Tags: 11.0.10_9-jdk-hotspot-focal, 11-jdk-hotspot-focal, 11-hotspot-focal
 SharedTags: 11.0.10_9-jdk-hotspot, 11-jdk-hotspot, 11-hotspot, 11-jdk, 11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
 Tags: 11.0.10_9-jdk-hotspot-windowsservercore-1809, 11-jdk-hotspot-windowsservercore-1809, 11-hotspot-windowsservercore-1809
 SharedTags: 11.0.10_9-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.10_9-jdk-hotspot, 11-jdk-hotspot, 11-hotspot, 11-jdk, 11
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
@@ -111,7 +111,7 @@ Constraints: windowsservercore-1809
 Tags: 11.0.10_9-jdk-hotspot-windowsservercore-ltsc2016, 11-jdk-hotspot-windowsservercore-ltsc2016, 11-hotspot-windowsservercore-ltsc2016
 SharedTags: 11.0.10_9-jdk-hotspot-windowsservercore, 11-jdk-hotspot-windowsservercore, 11-hotspot-windowsservercore, 11.0.10_9-jdk-hotspot, 11-jdk-hotspot, 11-hotspot, 11-jdk, 11
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
@@ -119,14 +119,14 @@ Constraints: windowsservercore-ltsc2016
 Tags: 11.0.10_9-jdk-openj9-0.24.0-focal, 11-jdk-openj9-focal, 11-openj9-focal
 SharedTags: 11.0.10_9-jdk-openj9-0.24.0, 11-jdk-openj9, 11-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
 Tags: 11.0.10_9-jdk-openj9-0.24.0-windowsservercore-1809, 11-jdk-openj9-windowsservercore-1809, 11-openj9-windowsservercore-1809
 SharedTags: 11.0.10_9-jdk-openj9-0.24.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.10_9-jdk-openj9-0.24.0, 11-jdk-openj9, 11-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
@@ -134,7 +134,7 @@ Constraints: windowsservercore-1809
 Tags: 11.0.10_9-jdk-openj9-0.24.0-windowsservercore-ltsc2016, 11-jdk-openj9-windowsservercore-ltsc2016, 11-openj9-windowsservercore-ltsc2016
 SharedTags: 11.0.10_9-jdk-openj9-0.24.0-windowsservercore, 11-jdk-openj9-windowsservercore, 11-openj9-windowsservercore, 11.0.10_9-jdk-openj9-0.24.0, 11-jdk-openj9, 11-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
@@ -142,14 +142,14 @@ Constraints: windowsservercore-ltsc2016
 Tags: 11.0.10_9-jre-hotspot-focal, 11-jre-hotspot-focal
 SharedTags: 11.0.10_9-jre-hotspot, 11-jre-hotspot, 11-jre
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
 Tags: 11.0.10_9-jre-hotspot-windowsservercore-1809, 11-jre-hotspot-windowsservercore-1809
 SharedTags: 11.0.10_9-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.10_9-jre-hotspot, 11-jre-hotspot, 11-jre
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
@@ -157,7 +157,7 @@ Constraints: windowsservercore-1809
 Tags: 11.0.10_9-jre-hotspot-windowsservercore-ltsc2016, 11-jre-hotspot-windowsservercore-ltsc2016
 SharedTags: 11.0.10_9-jre-hotspot-windowsservercore, 11-jre-hotspot-windowsservercore, 11.0.10_9-jre-hotspot, 11-jre-hotspot, 11-jre
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
@@ -165,14 +165,14 @@ Constraints: windowsservercore-ltsc2016
 Tags: 11.0.10_9-jre-openj9-0.24.0-focal, 11-jre-openj9-focal
 SharedTags: 11.0.10_9-jre-openj9-0.24.0, 11-jre-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
 Tags: 11.0.10_9-jre-openj9-0.24.0-windowsservercore-1809, 11-jre-openj9-windowsservercore-1809
 SharedTags: 11.0.10_9-jre-openj9-0.24.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.10_9-jre-openj9-0.24.0, 11-jre-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
@@ -180,191 +180,191 @@ Constraints: windowsservercore-1809
 Tags: 11.0.10_9-jre-openj9-0.24.0-windowsservercore-ltsc2016, 11-jre-openj9-windowsservercore-ltsc2016
 SharedTags: 11.0.10_9-jre-openj9-0.24.0-windowsservercore, 11-jre-openj9-windowsservercore, 11.0.10_9-jre-openj9-0.24.0, 11-jre-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
 Directory: 11/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jdk-hotspot-focal, 14-jdk-hotspot-focal, 14-hotspot-focal
-SharedTags: 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot, 14-jdk, 14
+Tags: 15.0.2_7-jdk-hotspot-focal, 15-jdk-hotspot-focal, 15-hotspot-focal
+SharedTags: 15.0.2_7-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, 15-jdk, 15
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jdk/ubuntu
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 14.0.2_12-jdk-hotspot-windowsservercore-1809, 14-jdk-hotspot-windowsservercore-1809, 14-hotspot-windowsservercore-1809
-SharedTags: 14.0.2_12-jdk-hotspot-windowsservercore, 14-jdk-hotspot-windowsservercore, 14-hotspot-windowsservercore, 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot, 14-jdk, 14
+Tags: 15.0.2_7-jdk-hotspot-windowsservercore-1809, 15-jdk-hotspot-windowsservercore-1809, 15-hotspot-windowsservercore-1809
+SharedTags: 15.0.2_7-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, 15.0.2_7-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, 15-jdk, 15
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jdk/windows/windowsservercore-1809
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 14.0.2_12-jdk-hotspot-windowsservercore-ltsc2016, 14-jdk-hotspot-windowsservercore-ltsc2016, 14-hotspot-windowsservercore-ltsc2016
-SharedTags: 14.0.2_12-jdk-hotspot-windowsservercore, 14-jdk-hotspot-windowsservercore, 14-hotspot-windowsservercore, 14.0.2_12-jdk-hotspot, 14-jdk-hotspot, 14-hotspot, 14-jdk, 14
+Tags: 15.0.2_7-jdk-hotspot-windowsservercore-ltsc2016, 15-jdk-hotspot-windowsservercore-ltsc2016, 15-hotspot-windowsservercore-ltsc2016
+SharedTags: 15.0.2_7-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, 15.0.2_7-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, 15-jdk, 15
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jdk/windows/windowsservercore-ltsc2016
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jdk-openj9-0.21.0-focal, 14-jdk-openj9-focal, 14-openj9-focal
-SharedTags: 14.0.2_12-jdk-openj9-0.21.0, 14-jdk-openj9, 14-openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jdk/ubuntu
+Tags: 15.0.2_7-jdk-openj9-0.24.0-focal, 15-jdk-openj9-focal, 15-openj9-focal
+SharedTags: 15.0.2_7-jdk-openj9-0.24.0, 15-jdk-openj9, 15-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore-1809, 14-jdk-openj9-windowsservercore-1809, 14-openj9-windowsservercore-1809
-SharedTags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore, 14-jdk-openj9-windowsservercore, 14-openj9-windowsservercore, 14.0.2_12-jdk-openj9-0.21.0, 14-jdk-openj9, 14-openj9
+Tags: 15.0.2_7-jdk-openj9-0.24.0-windowsservercore-1809, 15-jdk-openj9-windowsservercore-1809, 15-openj9-windowsservercore-1809
+SharedTags: 15.0.2_7-jdk-openj9-0.24.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, 15.0.2_7-jdk-openj9-0.24.0, 15-jdk-openj9, 15-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jdk/windows/windowsservercore-1809
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore-ltsc2016, 14-jdk-openj9-windowsservercore-ltsc2016, 14-openj9-windowsservercore-ltsc2016
-SharedTags: 14.0.2_12-jdk-openj9-0.21.0-windowsservercore, 14-jdk-openj9-windowsservercore, 14-openj9-windowsservercore, 14.0.2_12-jdk-openj9-0.21.0, 14-jdk-openj9, 14-openj9
+Tags: 15.0.2_7-jdk-openj9-0.24.0-windowsservercore-ltsc2016, 15-jdk-openj9-windowsservercore-ltsc2016, 15-openj9-windowsservercore-ltsc2016
+SharedTags: 15.0.2_7-jdk-openj9-0.24.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, 15.0.2_7-jdk-openj9-0.24.0, 15-jdk-openj9, 15-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jdk/windows/windowsservercore-ltsc2016
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jre-hotspot-focal, 14-jre-hotspot-focal
-SharedTags: 14.0.2_12-jre-hotspot, 14-jre-hotspot, 14-jre
+Tags: 15.0.2_7-jre-hotspot-focal, 15-jre-hotspot-focal
+SharedTags: 15.0.2_7-jre-hotspot, 15-jre-hotspot, 15-jre
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jre/ubuntu
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 14.0.2_12-jre-hotspot-windowsservercore-1809, 14-jre-hotspot-windowsservercore-1809
-SharedTags: 14.0.2_12-jre-hotspot-windowsservercore, 14-jre-hotspot-windowsservercore, 14.0.2_12-jre-hotspot, 14-jre-hotspot, 14-jre
+Tags: 15.0.2_7-jre-hotspot-windowsservercore-1809, 15-jre-hotspot-windowsservercore-1809
+SharedTags: 15.0.2_7-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15.0.2_7-jre-hotspot, 15-jre-hotspot, 15-jre
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jre/windows/windowsservercore-1809
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 14.0.2_12-jre-hotspot-windowsservercore-ltsc2016, 14-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 14.0.2_12-jre-hotspot-windowsservercore, 14-jre-hotspot-windowsservercore, 14.0.2_12-jre-hotspot, 14-jre-hotspot, 14-jre
+Tags: 15.0.2_7-jre-hotspot-windowsservercore-ltsc2016, 15-jre-hotspot-windowsservercore-ltsc2016
+SharedTags: 15.0.2_7-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15.0.2_7-jre-hotspot, 15-jre-hotspot, 15-jre
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jre/windows/windowsservercore-ltsc2016
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 14.0.2_12-jre-openj9-0.21.0-focal, 14-jre-openj9-focal
-SharedTags: 14.0.2_12-jre-openj9-0.21.0, 14-jre-openj9
-Architectures: amd64, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jre/ubuntu
+Tags: 15.0.2_7-jre-openj9-0.24.0-focal, 15-jre-openj9-focal
+SharedTags: 15.0.2_7-jre-openj9-0.24.0, 15-jre-openj9
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore-1809, 14-jre-openj9-windowsservercore-1809
-SharedTags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore, 14-jre-openj9-windowsservercore, 14.0.2_12-jre-openj9-0.21.0, 14-jre-openj9
+Tags: 15.0.2_7-jre-openj9-0.24.0-windowsservercore-1809, 15-jre-openj9-windowsservercore-1809
+SharedTags: 15.0.2_7-jre-openj9-0.24.0-windowsservercore, 15-jre-openj9-windowsservercore, 15.0.2_7-jre-openj9-0.24.0, 15-jre-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jre/windows/windowsservercore-1809
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore-ltsc2016, 14-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 14.0.2_12-jre-openj9-0.21.0-windowsservercore, 14-jre-openj9-windowsservercore, 14.0.2_12-jre-openj9-0.21.0, 14-jre-openj9
+Tags: 15.0.2_7-jre-openj9-0.24.0-windowsservercore-ltsc2016, 15-jre-openj9-windowsservercore-ltsc2016
+SharedTags: 15.0.2_7-jre-openj9-0.24.0-windowsservercore, 15-jre-openj9-windowsservercore, 15.0.2_7-jre-openj9-0.24.0, 15-jre-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 14/jre/windows/windowsservercore-ltsc2016
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 15/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15.0.2_7-jdk-hotspot-focal, 15-jdk-hotspot-focal, 15-hotspot-focal, hotspot-focal
-SharedTags: 15.0.2_7-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, 15-jdk, 15, jdk, latest
+Tags: 16_36-jdk-hotspot-focal, 16-jdk-hotspot-focal, 16-hotspot-focal, hotspot-focal
+SharedTags: 16_36-jdk-hotspot, 16-jdk-hotspot, 16-hotspot, hotspot, 16-jdk, 16, jdk, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jdk/ubuntu
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jdk/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 15.0.2_7-jdk-hotspot-windowsservercore-1809, 15-jdk-hotspot-windowsservercore-1809, 15-hotspot-windowsservercore-1809, hotspot-windowsservercore-1809
-SharedTags: 15.0.2_7-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15.0.2_7-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, 15-jdk, 15, jdk, latest
+Tags: 16_36-jdk-hotspot-windowsservercore-1809, 16-jdk-hotspot-windowsservercore-1809, 16-hotspot-windowsservercore-1809, hotspot-windowsservercore-1809
+SharedTags: 16_36-jdk-hotspot-windowsservercore, 16-jdk-hotspot-windowsservercore, 16-hotspot-windowsservercore, hotspot-windowsservercore, 16_36-jdk-hotspot, 16-jdk-hotspot, 16-hotspot, hotspot, 16-jdk, 16, jdk, latest
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jdk/windows/windowsservercore-1809
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jdk/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15.0.2_7-jdk-hotspot-windowsservercore-ltsc2016, 15-jdk-hotspot-windowsservercore-ltsc2016, 15-hotspot-windowsservercore-ltsc2016, hotspot-windowsservercore-ltsc2016
-SharedTags: 15.0.2_7-jdk-hotspot-windowsservercore, 15-jdk-hotspot-windowsservercore, 15-hotspot-windowsservercore, hotspot-windowsservercore, 15.0.2_7-jdk-hotspot, 15-jdk-hotspot, 15-hotspot, hotspot, 15-jdk, 15, jdk, latest
+Tags: 16_36-jdk-hotspot-windowsservercore-ltsc2016, 16-jdk-hotspot-windowsservercore-ltsc2016, 16-hotspot-windowsservercore-ltsc2016, hotspot-windowsservercore-ltsc2016
+SharedTags: 16_36-jdk-hotspot-windowsservercore, 16-jdk-hotspot-windowsservercore, 16-hotspot-windowsservercore, hotspot-windowsservercore, 16_36-jdk-hotspot, 16-jdk-hotspot, 16-hotspot, hotspot, 16-jdk, 16, jdk, latest
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jdk/windows/windowsservercore-ltsc2016
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15.0.2_7-jdk-openj9-0.24.0-focal, 15-jdk-openj9-focal, 15-openj9-focal, openj9-focal
-SharedTags: 15.0.2_7-jdk-openj9-0.24.0, 15-jdk-openj9, 15-openj9, openj9
+Tags: 16_36-jdk-openj9-0.25.0-focal, 16-jdk-openj9-focal, 16-openj9-focal, openj9-focal
+SharedTags: 16_36-jdk-openj9-0.25.0, 16-jdk-openj9, 16-openj9, openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jdk/ubuntu
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jdk/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 15.0.2_7-jdk-openj9-0.24.0-windowsservercore-1809, 15-jdk-openj9-windowsservercore-1809, 15-openj9-windowsservercore-1809, openj9-windowsservercore-1809
-SharedTags: 15.0.2_7-jdk-openj9-0.24.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15.0.2_7-jdk-openj9-0.24.0, 15-jdk-openj9, 15-openj9, openj9
+Tags: 16_36-jdk-openj9-0.25.0-windowsservercore-1809, 16-jdk-openj9-windowsservercore-1809, 16-openj9-windowsservercore-1809, openj9-windowsservercore-1809
+SharedTags: 16_36-jdk-openj9-0.25.0-windowsservercore, 16-jdk-openj9-windowsservercore, 16-openj9-windowsservercore, openj9-windowsservercore, 16_36-jdk-openj9-0.25.0, 16-jdk-openj9, 16-openj9, openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jdk/windows/windowsservercore-1809
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jdk/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15.0.2_7-jdk-openj9-0.24.0-windowsservercore-ltsc2016, 15-jdk-openj9-windowsservercore-ltsc2016, 15-openj9-windowsservercore-ltsc2016, openj9-windowsservercore-ltsc2016
-SharedTags: 15.0.2_7-jdk-openj9-0.24.0-windowsservercore, 15-jdk-openj9-windowsservercore, 15-openj9-windowsservercore, openj9-windowsservercore, 15.0.2_7-jdk-openj9-0.24.0, 15-jdk-openj9, 15-openj9, openj9
+Tags: 16_36-jdk-openj9-0.25.0-windowsservercore-ltsc2016, 16-jdk-openj9-windowsservercore-ltsc2016, 16-openj9-windowsservercore-ltsc2016, openj9-windowsservercore-ltsc2016
+SharedTags: 16_36-jdk-openj9-0.25.0-windowsservercore, 16-jdk-openj9-windowsservercore, 16-openj9-windowsservercore, openj9-windowsservercore, 16_36-jdk-openj9-0.25.0, 16-jdk-openj9, 16-openj9, openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jdk/windows/windowsservercore-ltsc2016
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jdk/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15.0.2_7-jre-hotspot-focal, 15-jre-hotspot-focal
-SharedTags: 15.0.2_7-jre-hotspot, 15-jre-hotspot, 15-jre
+Tags: 16_36-jre-hotspot-focal, 16-jre-hotspot-focal
+SharedTags: 16_36-jre-hotspot, 16-jre-hotspot, 16-jre
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jre/ubuntu
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jre/ubuntu
 File: Dockerfile.hotspot.releases.full
 
-Tags: 15.0.2_7-jre-hotspot-windowsservercore-1809, 15-jre-hotspot-windowsservercore-1809
-SharedTags: 15.0.2_7-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15.0.2_7-jre-hotspot, 15-jre-hotspot, 15-jre
+Tags: 16_36-jre-hotspot-windowsservercore-1809, 16-jre-hotspot-windowsservercore-1809
+SharedTags: 16_36-jre-hotspot-windowsservercore, 16-jre-hotspot-windowsservercore, 16_36-jre-hotspot, 16-jre-hotspot, 16-jre
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jre/windows/windowsservercore-1809
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jre/windows/windowsservercore-1809
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15.0.2_7-jre-hotspot-windowsservercore-ltsc2016, 15-jre-hotspot-windowsservercore-ltsc2016
-SharedTags: 15.0.2_7-jre-hotspot-windowsservercore, 15-jre-hotspot-windowsservercore, 15.0.2_7-jre-hotspot, 15-jre-hotspot, 15-jre
+Tags: 16_36-jre-hotspot-windowsservercore-ltsc2016, 16-jre-hotspot-windowsservercore-ltsc2016
+SharedTags: 16_36-jre-hotspot-windowsservercore, 16-jre-hotspot-windowsservercore, 16_36-jre-hotspot, 16-jre-hotspot, 16-jre
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jre/windows/windowsservercore-ltsc2016
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.hotspot.releases.full
 Constraints: windowsservercore-ltsc2016
 
-Tags: 15.0.2_7-jre-openj9-0.24.0-focal, 15-jre-openj9-focal
-SharedTags: 15.0.2_7-jre-openj9-0.24.0, 15-jre-openj9
+Tags: 16_36-jre-openj9-0.25.0-focal, 16-jre-openj9-focal
+SharedTags: 16_36-jre-openj9-0.25.0, 16-jre-openj9
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jre/ubuntu
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jre/ubuntu
 File: Dockerfile.openj9.releases.full
 
-Tags: 15.0.2_7-jre-openj9-0.24.0-windowsservercore-1809, 15-jre-openj9-windowsservercore-1809
-SharedTags: 15.0.2_7-jre-openj9-0.24.0-windowsservercore, 15-jre-openj9-windowsservercore, 15.0.2_7-jre-openj9-0.24.0, 15-jre-openj9
+Tags: 16_36-jre-openj9-0.25.0-windowsservercore-1809, 16-jre-openj9-windowsservercore-1809
+SharedTags: 16_36-jre-openj9-0.25.0-windowsservercore, 16-jre-openj9-windowsservercore, 16_36-jre-openj9-0.25.0, 16-jre-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jre/windows/windowsservercore-1809
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jre/windows/windowsservercore-1809
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-1809
 
-Tags: 15.0.2_7-jre-openj9-0.24.0-windowsservercore-ltsc2016, 15-jre-openj9-windowsservercore-ltsc2016
-SharedTags: 15.0.2_7-jre-openj9-0.24.0-windowsservercore, 15-jre-openj9-windowsservercore, 15.0.2_7-jre-openj9-0.24.0, 15-jre-openj9
+Tags: 16_36-jre-openj9-0.25.0-windowsservercore-ltsc2016, 16-jre-openj9-windowsservercore-ltsc2016
+SharedTags: 16_36-jre-openj9-0.25.0-windowsservercore, 16-jre-openj9-windowsservercore, 16_36-jre-openj9-0.25.0, 16-jre-openj9
 Architectures: windows-amd64
-GitCommit: a1f43408ff2770a36d3e9b8e23ba7c03ab26c33c
-Directory: 15/jre/windows/windowsservercore-ltsc2016
+GitCommit: 820829025ee3eb66b5dc9e5fed0ee3171aababe9
+Directory: 16/jre/windows/windowsservercore-ltsc2016
 File: Dockerfile.openj9.releases.full
 Constraints: windowsservercore-ltsc2016
diff --git a/_bashbrew-list b/_bashbrew-list
index 3b98bd5..8a2964e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -104,59 +104,6 @@ adoptopenjdk:11.0.10_9-jre-openj9-0.24.0-focal
 adoptopenjdk:11.0.10_9-jre-openj9-0.24.0-windowsservercore
 adoptopenjdk:11.0.10_9-jre-openj9-0.24.0-windowsservercore-1809
 adoptopenjdk:11.0.10_9-jre-openj9-0.24.0-windowsservercore-ltsc2016
-adoptopenjdk:14
-adoptopenjdk:14-hotspot
-adoptopenjdk:14-hotspot-focal
-adoptopenjdk:14-hotspot-windowsservercore
-adoptopenjdk:14-hotspot-windowsservercore-1809
-adoptopenjdk:14-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:14-jdk
-adoptopenjdk:14-jdk-hotspot
-adoptopenjdk:14-jdk-hotspot-focal
-adoptopenjdk:14-jdk-hotspot-windowsservercore
-adoptopenjdk:14-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:14-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:14-jdk-openj9
-adoptopenjdk:14-jdk-openj9-focal
-adoptopenjdk:14-jdk-openj9-windowsservercore
-adoptopenjdk:14-jdk-openj9-windowsservercore-1809
-adoptopenjdk:14-jdk-openj9-windowsservercore-ltsc2016
-adoptopenjdk:14-jre
-adoptopenjdk:14-jre-hotspot
-adoptopenjdk:14-jre-hotspot-focal
-adoptopenjdk:14-jre-hotspot-windowsservercore
-adoptopenjdk:14-jre-hotspot-windowsservercore-1809
-adoptopenjdk:14-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:14-jre-openj9
-adoptopenjdk:14-jre-openj9-focal
-adoptopenjdk:14-jre-openj9-windowsservercore
-adoptopenjdk:14-jre-openj9-windowsservercore-1809
-adoptopenjdk:14-jre-openj9-windowsservercore-ltsc2016
-adoptopenjdk:14-openj9
-adoptopenjdk:14-openj9-focal
-adoptopenjdk:14-openj9-windowsservercore
-adoptopenjdk:14-openj9-windowsservercore-1809
-adoptopenjdk:14-openj9-windowsservercore-ltsc2016
-adoptopenjdk:14.0.2_12-jdk-hotspot
-adoptopenjdk:14.0.2_12-jdk-hotspot-focal
-adoptopenjdk:14.0.2_12-jdk-hotspot-windowsservercore
-adoptopenjdk:14.0.2_12-jdk-hotspot-windowsservercore-1809
-adoptopenjdk:14.0.2_12-jdk-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0
-adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-focal
-adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-windowsservercore
-adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:14.0.2_12-jdk-openj9-0.21.0-windowsservercore-ltsc2016
-adoptopenjdk:14.0.2_12-jre-hotspot
-adoptopenjdk:14.0.2_12-jre-hotspot-focal
-adoptopenjdk:14.0.2_12-jre-hotspot-windowsservercore
-adoptopenjdk:14.0.2_12-jre-hotspot-windowsservercore-1809
-adoptopenjdk:14.0.2_12-jre-hotspot-windowsservercore-ltsc2016
-adoptopenjdk:14.0.2_12-jre-openj9-0.21.0
-adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-focal
-adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-windowsservercore
-adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-windowsservercore-1809
-adoptopenjdk:14.0.2_12-jre-openj9-0.21.0-windowsservercore-ltsc2016
 adoptopenjdk:15
 adoptopenjdk:15-hotspot
 adoptopenjdk:15-hotspot-focal
@@ -210,6 +157,59 @@ adoptopenjdk:15.0.2_7-jre-openj9-0.24.0-focal
 adoptopenjdk:15.0.2_7-jre-openj9-0.24.0-windowsservercore
 adoptopenjdk:15.0.2_7-jre-openj9-0.24.0-windowsservercore-1809
 adoptopenjdk:15.0.2_7-jre-openj9-0.24.0-windowsservercore-ltsc2016
+adoptopenjdk:16
+adoptopenjdk:16-hotspot
+adoptopenjdk:16-hotspot-focal
+adoptopenjdk:16-hotspot-windowsservercore
+adoptopenjdk:16-hotspot-windowsservercore-1809
+adoptopenjdk:16-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:16-jdk
+adoptopenjdk:16-jdk-hotspot
+adoptopenjdk:16-jdk-hotspot-focal
+adoptopenjdk:16-jdk-hotspot-windowsservercore
+adoptopenjdk:16-jdk-hotspot-windowsservercore-1809
+adoptopenjdk:16-jdk-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:16-jdk-openj9
+adoptopenjdk:16-jdk-openj9-focal
+adoptopenjdk:16-jdk-openj9-windowsservercore
+adoptopenjdk:16-jdk-openj9-windowsservercore-1809
+adoptopenjdk:16-jdk-openj9-windowsservercore-ltsc2016
+adoptopenjdk:16-jre
+adoptopenjdk:16-jre-hotspot
+adoptopenjdk:16-jre-hotspot-focal
+adoptopenjdk:16-jre-hotspot-windowsservercore
+adoptopenjdk:16-jre-hotspot-windowsservercore-1809
+adoptopenjdk:16-jre-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:16-jre-openj9
+adoptopenjdk:16-jre-openj9-focal
+adoptopenjdk:16-jre-openj9-windowsservercore
+adoptopenjdk:16-jre-openj9-windowsservercore-1809
+adoptopenjdk:16-jre-openj9-windowsservercore-ltsc2016
+adoptopenjdk:16-openj9
+adoptopenjdk:16-openj9-focal
+adoptopenjdk:16-openj9-windowsservercore
+adoptopenjdk:16-openj9-windowsservercore-1809
+adoptopenjdk:16-openj9-windowsservercore-ltsc2016
+adoptopenjdk:16_36-jdk-hotspot
+adoptopenjdk:16_36-jdk-hotspot-focal
+adoptopenjdk:16_36-jdk-hotspot-windowsservercore
+adoptopenjdk:16_36-jdk-hotspot-windowsservercore-1809
+adoptopenjdk:16_36-jdk-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:16_36-jdk-openj9-0.25.0
+adoptopenjdk:16_36-jdk-openj9-0.25.0-focal
+adoptopenjdk:16_36-jdk-openj9-0.25.0-windowsservercore
+adoptopenjdk:16_36-jdk-openj9-0.25.0-windowsservercore-1809
+adoptopenjdk:16_36-jdk-openj9-0.25.0-windowsservercore-ltsc2016
+adoptopenjdk:16_36-jre-hotspot
+adoptopenjdk:16_36-jre-hotspot-focal
+adoptopenjdk:16_36-jre-hotspot-windowsservercore
+adoptopenjdk:16_36-jre-hotspot-windowsservercore-1809
+adoptopenjdk:16_36-jre-hotspot-windowsservercore-ltsc2016
+adoptopenjdk:16_36-jre-openj9-0.25.0
+adoptopenjdk:16_36-jre-openj9-0.25.0-focal
+adoptopenjdk:16_36-jre-openj9-0.25.0-windowsservercore
+adoptopenjdk:16_36-jre-openj9-0.25.0-windowsservercore-1809
+adoptopenjdk:16_36-jre-openj9-0.25.0-windowsservercore-ltsc2016
 adoptopenjdk:hotspot
 adoptopenjdk:hotspot-focal
 adoptopenjdk:hotspot-windowsservercore
diff --git a/adoptopenjdk_14-hotspot-focal/Dockerfile.hotspot.releases.full b/adoptopenjdk_14-hotspot-focal/Dockerfile.hotspot.releases.full
deleted file mode 100644
index 93b4243..0000000
diff --git a/adoptopenjdk_14-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_14-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
deleted file mode 100644
index 89a3af2..0000000
diff --git a/adoptopenjdk_14-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_14-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
deleted file mode 100644
index b71b65c..0000000
diff --git a/adoptopenjdk_14-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_14-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
deleted file mode 100644
index eb8b62b..0000000
diff --git a/adoptopenjdk_14-jre-openj9-focal/Dockerfile.openj9.releases.full b/adoptopenjdk_14-jre-openj9-focal/Dockerfile.openj9.releases.full
deleted file mode 100644
index f4c5611..0000000
diff --git a/adoptopenjdk_14-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_14-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
deleted file mode 100644
index 468c265..0000000
diff --git a/adoptopenjdk_14-openj9-focal/Dockerfile.openj9.releases.full b/adoptopenjdk_14-openj9-focal/Dockerfile.openj9.releases.full
deleted file mode 100644
index 6c96cb8..0000000
diff --git a/adoptopenjdk_14-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_14-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
deleted file mode 100644
index bef51c3..0000000
diff --git a/adoptopenjdk_14-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_14-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
deleted file mode 100644
index 4dfe67a..0000000
diff --git a/adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full b/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 100%
copy from adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
copy to adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
diff --git a/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_15-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
similarity index 100%
copy from adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
copy to adoptopenjdk_15-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
diff --git a/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_15-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
similarity index 100%
copy from adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
copy to adoptopenjdk_15-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
diff --git a/adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full b/adoptopenjdk_15-openj9-focal/Dockerfile.openj9.releases.full
similarity index 100%
copy from adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
copy to adoptopenjdk_15-openj9-focal/Dockerfile.openj9.releases.full
diff --git a/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_15-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
similarity index 100%
copy from adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
copy to adoptopenjdk_15-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
diff --git a/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_15-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
similarity index 100%
copy from adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
copy to adoptopenjdk_15-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
diff --git a/adoptopenjdk_14-jre-hotspot-focal/Dockerfile.hotspot.releases.full b/adoptopenjdk_16-jre-hotspot-focal/Dockerfile.hotspot.releases.full
similarity index 60%
rename from adoptopenjdk_14-jre-hotspot-focal/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_16-jre-hotspot-focal/Dockerfile.hotspot.releases.full
index c3f04ca..61b0607 100644
--- a/adoptopenjdk_14-jre-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_16-jre-hotspot-focal/Dockerfile.hotspot.releases.full
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-14.0.2+12
+ENV JAVA_VERSION jdk-16+36
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='2b749ceead19d68dd7e3c28b143dc4f94bb0916378a98b7346e851318ea4da84'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_aarch64_linux_hotspot_14.0.2_12.tar.gz'; \
+         ESUM='947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='4468ecf74956783ae41a46e8ba023c003c69e4d111622944aad1af764a1bc4af'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_arm_linux_hotspot_14.0.2_12.tar.gz'; \
+         ESUM='4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='0f96998be562cfbe8a4114581349dbd2609d0a23091e538fe142dcd9c83e70cf'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_ppc64le_linux_hotspot_14.0.2_12.tar.gz'; \
+         ESUM='1e5b54ad65a072d924273cade535b1e5da823cebf72b3645a34c32fb141a2401'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_ppc64le_linux_hotspot_16_36.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='9c4a87ea44165ccbcab5124b997ec1af1551bd2a2b255fca57d7a4e19c2075d3'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_s390x_linux_hotspot_14.0.2_12.tar.gz'; \
+         ESUM='2033fee36e83c7f9d37455b29c5f49c5ed0ece7c5b05d52bab8e3cdb3e524a77'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_s390x_linux_hotspot_16_36.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='1107845947da56e6bdad0da0b79210a079a74ec5c806f815ec5db9d09e1a9236'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_linux_hotspot_14.0.2_12.tar.gz'; \
+         ESUM='4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_16-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
similarity index 77%
copy from adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
copy to adoptopenjdk_16-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index c72f681..fab4637 100644
--- a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_16-jre-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u282-b08
+ENV JAVA_VERSION jdk-16+36
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u282b08.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_windows_hotspot_8u282b08.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (fe137353ffa9f5b02c7783737e73ddf7668a3222b02c5d91abb8b8a2e55871ff) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fe137353ffa9f5b02c7783737e73ddf7668a3222b02c5d91abb8b8a2e55871ff') { \
+    wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (8871544e7e2a5a4ad7ec1d8b976a1fb19b312ab77fcd4681014669341691cc44) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8871544e7e2a5a4ad7ec1d8b976a1fb19b312ab77fcd4681014669341691cc44') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_14-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_16-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
similarity index 77%
rename from adoptopenjdk_14-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
rename to adoptopenjdk_16-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index f645611..7a276e5 100644
--- a/adoptopenjdk_14-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_16-jre-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-14.0.2+12
+ENV JAVA_VERSION jdk-16+36
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_windows_hotspot_14.0.2_12.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_windows_hotspot_14.0.2_12.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (bf468c78387b8095914a2d46af6961d5c22697929b66961e346a41fc8bf909d4) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'bf468c78387b8095914a2d46af6961d5c22697929b66961e346a41fc8bf909d4') { \
+    wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_windows_hotspot_16_36.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (8871544e7e2a5a4ad7ec1d8b976a1fb19b312ab77fcd4681014669341691cc44) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8871544e7e2a5a4ad7ec1d8b976a1fb19b312ab77fcd4681014669341691cc44') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-jre-openj9-focal/Dockerfile.openj9.releases.full b/adoptopenjdk_16-jre-openj9-focal/Dockerfile.openj9.releases.full
similarity index 81%
copy from adoptopenjdk_8-jre-openj9-focal/Dockerfile.openj9.releases.full
copy to adoptopenjdk_16-jre-openj9-focal/Dockerfile.openj9.releases.full
index 7601d1b..e08e15e 100644
--- a/adoptopenjdk_8-jre-openj9-focal/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_16-jre-openj9-focal/Dockerfile.openj9.releases.full
@@ -27,26 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0
+ENV JAVA_VERSION jdk-16+36_openj9-0.25.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='1ffc7ac14546ee5e16e0efd616073baaf1b80f55abf61257095f132ded9da1e5'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \
+         ESUM='13ae42f5040d4e5d97b8809e27ebfdf8f7326604771963d85b2c1385abe13742'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='8a120156119902e4e51162d72716f57c57b7eed88f3b46b8720d9bac22701459'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \
+         ESUM='0e80def3cc03b984b3407a3bda841569a9df074cc73640881ffd10b28290fde5'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='6e54e038c92778731a1f40dcf567850f695544a80fb02ec429e0c93654361bba'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_s390x_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \
+         ESUM='bb2631805a301ee61ac868b118d280d27be1063da2dedd4fae446d317e3ede7a'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz'; \
+         ESUM='302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_14-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_16-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
similarity index 75%
rename from adoptopenjdk_14-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
rename to adoptopenjdk_16-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 57e9792..c8f03fd 100644
--- a/adoptopenjdk_14-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_16-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-14.0.2+12_openj9-0.21.0
+ENV JAVA_VERSION jdk-16+36_openj9-0.25.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_windows_openj9_14.0.2_12_openj9-0.21.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_windows_openj9_16_36_openj9-0.25.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_windows_openj9_14.0.2_12_openj9-0.21.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (12c883da9337470094993384c68f85effdd1752575fc2316459b50d541e35060) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '12c883da9337470094993384c68f85effdd1752575fc2316459b50d541e35060') { \
+    wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_windows_openj9_16_36_openj9-0.25.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (49e6a468a50b65f7b3839881bca7a7fbea1be81d734f1b52662063a6db563387) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '49e6a468a50b65f7b3839881bca7a7fbea1be81d734f1b52662063a6db563387') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_16-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
similarity index 76%
copy from adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
copy to adoptopenjdk_16-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index 6a832b5..82977c8 100644
--- a/adoptopenjdk_8-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_16-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u282-b08_openj9-0.24.0
+ENV JAVA_VERSION jdk-16+36_openj9-0.25.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_windows_openj9_8u282b08_openj9-0.24.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_windows_openj9_16_36_openj9-0.25.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_windows_openj9_8u282b08_openj9-0.24.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (079268d9ba232091b81ef9bbf1f001e498ab7823b9def204a6fd1115e2e9d976) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '079268d9ba232091b81ef9bbf1f001e498ab7823b9def204a6fd1115e2e9d976') { \
+    wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_windows_openj9_16_36_openj9-0.25.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (49e6a468a50b65f7b3839881bca7a7fbea1be81d734f1b52662063a6db563387) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '49e6a468a50b65f7b3839881bca7a7fbea1be81d734f1b52662063a6db563387') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full b/adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
index 1600bbe..31e9543 100644
--- a/adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_hotspot-focal/Dockerfile.hotspot.releases.full
@@ -27,30 +27,30 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16+36
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz'; \
          ;; \
        armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='07438952a22007c308440072cf3835c1c075e7102670cc666a3c47c8648da35a'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_ppc64le_linux_hotspot_16_36.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='df34376116433f0e46c5e4935d73a0827d37b34d029f592d3b9383c92b024952'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_s390x_linux_hotspot_16_36.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
index 49e3efd..310a3a5 100644
--- a/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16+36
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449') { \
+    wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7e10ec7e61baad6293c8b2812eee7d049450602c9493f658f5476c48f0c450b1) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7e10ec7e61baad6293c8b2812eee7d049450602c9493f658f5476c48f0c450b1') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
index dac4dc9..00a0513 100644
--- a/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/adoptopenjdk_hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16+36
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449') { \
+    wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (7e10ec7e61baad6293c8b2812eee7d049450602c9493f658f5476c48f0c450b1) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '7e10ec7e61baad6293c8b2812eee7d049450602c9493f658f5476c48f0c450b1') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full b/adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
index e5fdea9..517691c 100644
--- a/adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_openj9-focal/Dockerfile.openj9.releases.full
@@ -27,26 +27,26 @@ RUN apt-get update \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7_openj9-0.24.0
+ENV JAVA_VERSION jdk-16+36_openj9-0.25.0
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz'; \
+         ESUM='f4d4e0c0e9e0a4d0f14172878cee5e1a0ae73170058e1c183a452f8d97331ac0'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='5b2158268de0be247801b7823ee3e7f739254d77718a1879848627181feee2f4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz'; \
+         ESUM='3cefa209bf6eb6fb1aa03661b26692c26036337022691c10cd4972556e0a0e0d'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_ppc64le_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='0f34a9dd2b800f669e004e543529e454c047a19919ec3b423552d171cb4f2626'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_s390x_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz'; \
+         ESUM='0165e38f6e25f3e6a4ccbfed732b9bcb0f438027e182b368ad905620b97bb162'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_s390x_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz'; \
+         ESUM='9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f'; \
+         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
index 00ab8b9..79dc1d2 100644
--- a/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:1809
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15.0.2+7_openj9-0.24.0
+ENV JAVA_VERSION jdk-16+36_openj9-0.25.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_windows_openj9_16_36_openj9-0.25.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (f366ebd9f9b4243a86bbf72975f9357a7fa6aec5dac40af4edd4c97ddb4d28b8) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f366ebd9f9b4243a86bbf72975f9357a7fa6aec5dac40af4edd4c97ddb4d28b8') { \
+    wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_windows_openj9_16_36_openj9-0.25.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (5d5a2dd21567b376185076c4fcba42caf9e5c35565bbc2c416140514c8622460) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5d5a2dd21567b376185076c4fcba42caf9e5c35565bbc2c416140514c8622460') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
diff --git a/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
index 25e9d3a..1b95e80 100644
--- a/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/adoptopenjdk_openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
@@ -22,13 +22,13 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15.0.2+7_openj9-0.24.0
+ENV JAVA_VERSION jdk-16+36_openj9-0.25.0
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi ...'); \
+RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_windows_openj9_16_36_openj9-0.25.0.msi ...'); \
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-    wget https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_windows_openj9_15.0.2_7_openj9-0.24.0.msi -O 'openjdk.msi'; \
-    Write-Host ('Verifying sha256 (f366ebd9f9b4243a86bbf72975f9357a7fa6aec5dac40af4edd4c97ddb4d28b8) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f366ebd9f9b4243a86bbf72975f9357a7fa6aec5dac40af4edd4c97ddb4d28b8') { \
+    wget https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_windows_openj9_16_36_openj9-0.25.0.msi -O 'openjdk.msi'; \
+    Write-Host ('Verifying sha256 (5d5a2dd21567b376185076c4fcba42caf9e5c35565bbc2c416140514c8622460) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '5d5a2dd21567b376185076c4fcba42caf9e5c35565bbc2c416140514c8622460') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \

@yosifkit yosifkit merged commit 261b169 into docker-library:master Mar 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/adoptopenjdk
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dinogun @yosifkit