From 6dfc5fd615d2c9bb115e0ea2eff7a803f744a221 Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Tue, 17 Aug 2021 11:28:35 +0100
Subject: [PATCH 1/2] add deprecation notice to casks

---
 Casks/adoptopenjdk-jre.rb          | 12 ++++++++++++
 Casks/adoptopenjdk-openj9-jre.rb   | 12 ++++++++++++
 Casks/adoptopenjdk-openj9.rb       | 12 ++++++++++++
 Casks/adoptopenjdk11-jre.rb        | 12 ++++++++++++
 Casks/adoptopenjdk11-openj9-jre.rb | 12 ++++++++++++
 Casks/adoptopenjdk11-openj9.rb     | 12 ++++++++++++
 Casks/adoptopenjdk11.rb            | 20 ++++++++++++++++----
 Casks/adoptopenjdk13-jre.rb        | 17 +++++++++++++++--
 Casks/adoptopenjdk13-openj9-jre.rb | 17 +++++++++++++++--
 Casks/adoptopenjdk13-openj9.rb     | 17 +++++++++++++++--
 Casks/adoptopenjdk13.rb            | 17 +++++++++++++++--
 Casks/adoptopenjdk14-jre.rb        | 15 ++++++++++++++-
 Casks/adoptopenjdk14-openj9-jre.rb | 15 ++++++++++++++-
 Casks/adoptopenjdk14-openj9.rb     | 15 ++++++++++++++-
 Casks/adoptopenjdk14.rb            | 15 ++++++++++++++-
 Casks/adoptopenjdk15-jre.rb        | 12 ++++++++++++
 Casks/adoptopenjdk15-openj9-jre.rb | 12 ++++++++++++
 Casks/adoptopenjdk15-openj9.rb     | 12 ++++++++++++
 Casks/adoptopenjdk15.rb            | 12 ++++++++++++
 Casks/adoptopenjdk16-jre.rb        | 12 ++++++++++++
 Casks/adoptopenjdk16-openj9-jre.rb | 12 ++++++++++++
 Casks/adoptopenjdk16-openj9.rb     | 12 ++++++++++++
 Casks/adoptopenjdk16.rb            | 20 ++++++++++++++++----
 Casks/adoptopenjdk8-jre.rb         | 12 ++++++++++++
 Casks/adoptopenjdk8-openj9-jre.rb  | 12 ++++++++++++
 Casks/adoptopenjdk8-openj9.rb      | 12 ++++++++++++
 Casks/adoptopenjdk8.rb             | 20 ++++++++++++++++----
 Templates/adoptopenjdk.rb.tmpl     | 12 ++++++++++++
 28 files changed, 368 insertions(+), 24 deletions(-)

diff --git a/Casks/adoptopenjdk-jre.rb b/Casks/adoptopenjdk-jre.rb
index af88febf..5fcf8102 100644
--- a/Casks/adoptopenjdk-jre.rb
+++ b/Casks/adoptopenjdk-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.16.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk-openj9-jre.rb b/Casks/adoptopenjdk-openj9-jre.rb
index 2bb7bac6..ceaca2e5 100644
--- a/Casks/adoptopenjdk-openj9-jre.rb
+++ b/Casks/adoptopenjdk-openj9-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.16-openj9.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk-openj9.rb b/Casks/adoptopenjdk-openj9.rb
index bad37351..18bda133 100644
--- a/Casks/adoptopenjdk-openj9.rb
+++ b/Casks/adoptopenjdk-openj9.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.16-openj9.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk11-jre.rb b/Casks/adoptopenjdk11-jre.rb
index 52f001aa..fbadc22c 100644
--- a/Casks/adoptopenjdk11-jre.rb
+++ b/Casks/adoptopenjdk11-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.11.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk11-openj9-jre.rb b/Casks/adoptopenjdk11-openj9-jre.rb
index 27c116bd..08b49f90 100644
--- a/Casks/adoptopenjdk11-openj9-jre.rb
+++ b/Casks/adoptopenjdk11-openj9-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.11-openj9.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk11-openj9.rb b/Casks/adoptopenjdk11-openj9.rb
index c075e98e..5aa2b1d3 100644
--- a/Casks/adoptopenjdk11-openj9.rb
+++ b/Casks/adoptopenjdk11-openj9.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.11-openj9.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk11.rb b/Casks/adoptopenjdk11.rb
index 66876ce5..8507988f 100644
--- a/Casks/adoptopenjdk11.rb
+++ b/Casks/adoptopenjdk11.rb
@@ -1,21 +1,33 @@
 # PLEASE DO NOT EDIT THIS FILE. EDIT Templates/adoptopenjdk.rb.tmpl
 cask "adoptopenjdk11" do
-  version "11.0.11,9"
-  sha256 "9a20441ff21c6aa2ebb6287f712e6c647d7b66f55ac23bdfb5e891f25efab1b7"
+  version "11.0.12,7"
+  sha256 "14d3bcab539cee1f757849984b6ab330fdf6b2caf7ed7067607c075f7f5d0a62"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.pkg",
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.pkg",
       verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 11"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
   homepage "https://adoptopenjdk.net/"
 
-  pkg "OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.pkg"
+  pkg "OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.pkg"
 
   postflight do
     system_command "/usr/sbin/pkgutil", args: ["--pkg-info", "net.adoptopenjdk.11.jdk"], print_stdout: true
   end
 
   uninstall pkgutil: "net.adoptopenjdk.11.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk13-jre.rb b/Casks/adoptopenjdk13-jre.rb
index 6c815a3b..c0ce4bfa 100644
--- a/Casks/adoptopenjdk13-jre.rb
+++ b/Casks/adoptopenjdk13-jre.rb
@@ -1,10 +1,11 @@
 # PLEASE DO NOT EDIT THIS FILE. EDIT Templates/adoptopenjdk.rb.tmpl
 cask "adoptopenjdk13-jre" do
-  version "13.0.2,8"
+  version "13.0.2,8.1"
   sha256 "06f4f7a1d968e600c134ccc245627d58b1c220086e27408fa0acdaad5d8c7a06"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.pkg"
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.pkg",
+      verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 13 (JRE)"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
@@ -17,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.13.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk13-openj9-jre.rb b/Casks/adoptopenjdk13-openj9-jre.rb
index 47186958..bf1bd9c0 100644
--- a/Casks/adoptopenjdk13-openj9-jre.rb
+++ b/Casks/adoptopenjdk13-openj9-jre.rb
@@ -1,10 +1,11 @@
 # PLEASE DO NOT EDIT THIS FILE. EDIT Templates/adoptopenjdk.rb.tmpl
 cask "adoptopenjdk13-openj9-jre" do
-  version "13.0.2,8"
+  version "13.0.2,8.1"
   sha256 "ff2fe1bf9356e94e7cd3bd8af070d41a64c8349ea8e03158c512b29e9ba6c6bf"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.pkg"
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.pkg",
+      verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 13 (OpenJ9) (JRE)"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
@@ -17,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.13-openj9.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk13-openj9.rb b/Casks/adoptopenjdk13-openj9.rb
index 856c6bff..b727ad2c 100644
--- a/Casks/adoptopenjdk13-openj9.rb
+++ b/Casks/adoptopenjdk13-openj9.rb
@@ -1,10 +1,11 @@
 # PLEASE DO NOT EDIT THIS FILE. EDIT Templates/adoptopenjdk.rb.tmpl
 cask "adoptopenjdk13-openj9" do
-  version "13.0.2,8"
+  version "13.0.2,8.1"
   sha256 "898ee58905a332f15678c6f687652d062954f8b77fad6f427df19614f49ce418"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.pkg"
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.pkg",
+      verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 13 (OpenJ9)"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
@@ -17,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.13-openj9.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk13.rb b/Casks/adoptopenjdk13.rb
index 266a692c..23814f1f 100644
--- a/Casks/adoptopenjdk13.rb
+++ b/Casks/adoptopenjdk13.rb
@@ -1,10 +1,11 @@
 # PLEASE DO NOT EDIT THIS FILE. EDIT Templates/adoptopenjdk.rb.tmpl
 cask "adoptopenjdk13" do
-  version "13.0.2,8"
+  version "13.0.2,8.1"
   sha256 "7b60830e61a0483ee81ed6ca6463e211a529e43b1f3815a57c2e3780ce4ba0ba"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.pkg"
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.pkg",
+      verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 13"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
@@ -17,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.13.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk14-jre.rb b/Casks/adoptopenjdk14-jre.rb
index 3fa0eeee..7e8c3f41 100644
--- a/Casks/adoptopenjdk14-jre.rb
+++ b/Casks/adoptopenjdk14-jre.rb
@@ -4,7 +4,8 @@
   sha256 "6e645faff5a7d2aa748b16a1af0e904a5ff2ee9fb1849bfffe132ee56a6b7567"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_mac_hotspot_14.0.2_12.pkg"
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_mac_hotspot_14.0.2_12.pkg",
+      verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 14 (JRE)"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
@@ -17,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.14.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk14-openj9-jre.rb b/Casks/adoptopenjdk14-openj9-jre.rb
index 2d96077e..89b95c69 100644
--- a/Casks/adoptopenjdk14-openj9-jre.rb
+++ b/Casks/adoptopenjdk14-openj9-jre.rb
@@ -4,7 +4,8 @@
   sha256 "5e7a2770592b1f6d6138d6ed020b487f508b1562f30c6ba789cda836726bba51"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_mac_openj9_14.0.2_12_openj9-0.21.0.pkg"
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_mac_openj9_14.0.2_12_openj9-0.21.0.pkg",
+      verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 14 (OpenJ9) (JRE)"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
@@ -17,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.14-openj9.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk14-openj9.rb b/Casks/adoptopenjdk14-openj9.rb
index ad39786f..1be88c4c 100644
--- a/Casks/adoptopenjdk14-openj9.rb
+++ b/Casks/adoptopenjdk14-openj9.rb
@@ -4,7 +4,8 @@
   sha256 "8aad7e930d34244489a10149a4346cecd8484ca7f440f7916bb9ec1e43275c2b"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_mac_openj9_14.0.2_12_openj9-0.21.0.pkg"
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_mac_openj9_14.0.2_12_openj9-0.21.0.pkg",
+      verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 14 (OpenJ9)"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
@@ -17,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.14-openj9.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk14.rb b/Casks/adoptopenjdk14.rb
index 79a99f74..ce7c0f45 100644
--- a/Casks/adoptopenjdk14.rb
+++ b/Casks/adoptopenjdk14.rb
@@ -4,7 +4,8 @@
   sha256 "9a5d065b47f98632fc9398d3d84086658af3cf8c1297ca1aa576db95918bca4d"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_mac_hotspot_14.0.2_12.pkg"
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_mac_hotspot_14.0.2_12.pkg",
+      verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 14"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
@@ -17,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.14.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk15-jre.rb b/Casks/adoptopenjdk15-jre.rb
index 8989a718..8b5fcfc4 100644
--- a/Casks/adoptopenjdk15-jre.rb
+++ b/Casks/adoptopenjdk15-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.15.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk15-openj9-jre.rb b/Casks/adoptopenjdk15-openj9-jre.rb
index 6a3ae885..79574343 100644
--- a/Casks/adoptopenjdk15-openj9-jre.rb
+++ b/Casks/adoptopenjdk15-openj9-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.15-openj9.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk15-openj9.rb b/Casks/adoptopenjdk15-openj9.rb
index 5cf07362..de44bdbf 100644
--- a/Casks/adoptopenjdk15-openj9.rb
+++ b/Casks/adoptopenjdk15-openj9.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.15-openj9.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk15.rb b/Casks/adoptopenjdk15.rb
index c055adb1..b78f2312 100644
--- a/Casks/adoptopenjdk15.rb
+++ b/Casks/adoptopenjdk15.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.15.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk16-jre.rb b/Casks/adoptopenjdk16-jre.rb
index 43b4f5af..3d7b0275 100644
--- a/Casks/adoptopenjdk16-jre.rb
+++ b/Casks/adoptopenjdk16-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.16.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk16-openj9-jre.rb b/Casks/adoptopenjdk16-openj9-jre.rb
index 05b5bbcc..7600871c 100644
--- a/Casks/adoptopenjdk16-openj9-jre.rb
+++ b/Casks/adoptopenjdk16-openj9-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.16-openj9.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk16-openj9.rb b/Casks/adoptopenjdk16-openj9.rb
index 517627b9..f07521fb 100644
--- a/Casks/adoptopenjdk16-openj9.rb
+++ b/Casks/adoptopenjdk16-openj9.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.16-openj9.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk16.rb b/Casks/adoptopenjdk16.rb
index 75bc4e1f..2096f76e 100644
--- a/Casks/adoptopenjdk16.rb
+++ b/Casks/adoptopenjdk16.rb
@@ -1,21 +1,33 @@
 # PLEASE DO NOT EDIT THIS FILE. EDIT Templates/adoptopenjdk.rb.tmpl
 cask "adoptopenjdk16" do
-  version "16.0.1,9"
-  sha256 "7308a15d054d07d504f616416b3622d153c3cc63906441a5730ca1f9d4a43854"
+  version "16.0.2,7"
+  sha256 "3348e66ae287c70e48935d435b62cc6dec65558f84e6d60ac283dbb78f81ef7d"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_mac_hotspot_16.0.1_9.pkg",
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.pkg",
       verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/AdoptOpenJDK/openjdk#{version.major}-binaries/releases/latest"
   name "AdoptOpenJDK 16"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
   homepage "https://adoptopenjdk.net/"
 
-  pkg "OpenJDK16U-jdk_x64_mac_hotspot_16.0.1_9.pkg"
+  pkg "OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.pkg"
 
   postflight do
     system_command "/usr/sbin/pkgutil", args: ["--pkg-info", "net.adoptopenjdk.16.jdk"], print_stdout: true
   end
 
   uninstall pkgutil: "net.adoptopenjdk.16.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk8-jre.rb b/Casks/adoptopenjdk8-jre.rb
index c9ceff9a..b39ff4d0 100644
--- a/Casks/adoptopenjdk8-jre.rb
+++ b/Casks/adoptopenjdk8-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.8.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk8-openj9-jre.rb b/Casks/adoptopenjdk8-openj9-jre.rb
index c32836eb..94c0c839 100644
--- a/Casks/adoptopenjdk8-openj9-jre.rb
+++ b/Casks/adoptopenjdk8-openj9-jre.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.8-openj9.jre"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk8-openj9.rb b/Casks/adoptopenjdk8-openj9.rb
index 765197f8..7c34ee1a 100644
--- a/Casks/adoptopenjdk8-openj9.rb
+++ b/Casks/adoptopenjdk8-openj9.rb
@@ -18,4 +18,16 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.8-openj9.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Casks/adoptopenjdk8.rb b/Casks/adoptopenjdk8.rb
index d05ff311..e6d1370f 100644
--- a/Casks/adoptopenjdk8.rb
+++ b/Casks/adoptopenjdk8.rb
@@ -1,21 +1,33 @@
 # PLEASE DO NOT EDIT THIS FILE. EDIT Templates/adoptopenjdk.rb.tmpl
 cask "adoptopenjdk8" do
-  version "8,292:b10"
-  sha256 "4e200bc752337abc9dbfddf125db6a600f2ec53566f6f119a83036c8242a7672"
+  version "8,302:b08"
+  sha256 "22a5acf972620b67c845eb771ae077ce71be54788993c4a433a3da5439d191c0"
 
   # github.com/AdoptOpenJDK was verified as official when first introduced to the cask
-  url "https://github.com/AdoptOpenJDK/openjdk#{version.before_comma}-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.pkg",
+  url "https://github.com/AdoptOpenJDK/openjdk#{version.before_comma}-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u302b08.pkg",
       verified: "https://github.com/AdoptOpenJDK"
   appcast "https://github.com/adoptopenjdk/openjdk#{version.before_comma}-binaries/releases/latest"
   name "AdoptOpenJDK 8"
   desc "AdoptOpenJDK OpenJDK (Java) Development Kit"
   homepage "https://adoptopenjdk.net/"
 
-  pkg "OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.pkg"
+  pkg "OpenJDK8U-jdk_x64_mac_hotspot_8u302b08.pkg"
 
   postflight do
     system_command "/usr/sbin/pkgutil", args: ["--pkg-info", "net.adoptopenjdk.8.jdk"], print_stdout: true
   end
 
   uninstall pkgutil: "net.adoptopenjdk.8.jdk"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end
diff --git a/Templates/adoptopenjdk.rb.tmpl b/Templates/adoptopenjdk.rb.tmpl
index d4664f86..b5e7aa67 100644
--- a/Templates/adoptopenjdk.rb.tmpl
+++ b/Templates/adoptopenjdk.rb.tmpl
@@ -18,4 +18,16 @@ cask "{cask_name}" do
   end
 
   uninstall pkgutil: "{identifier}"
+
+  caveats do
+    discontinued
+
+    <<~EOS
+      Temurin is the official successor to this software:
+
+        brew install --cask temurin
+
+      See https://github.com/AdoptOpenJDK/homebrew-openjdk/issues/537 for more information.
+    EOS
+  end
 end

From c1657c7bf6f77a17eccc9baa6aec0461ef7448fe Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Tue, 17 Aug 2021 11:36:07 +0100
Subject: [PATCH 2/2] linter fixes

---
 Casks/adoptopenjdk11-openj9-jre-large.rb | 2 +-
 Casks/adoptopenjdk15-openj9-jre-large.rb | 2 +-
 Casks/adoptopenjdk15-openj9-large.rb     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Casks/adoptopenjdk11-openj9-jre-large.rb b/Casks/adoptopenjdk11-openj9-jre-large.rb
index 2ba3bdc3..12d813d7 100644
--- a/Casks/adoptopenjdk11-openj9-jre-large.rb
+++ b/Casks/adoptopenjdk11-openj9-jre-large.rb
@@ -18,7 +18,7 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.11-openj9.jre"
-  
+
   caveats do
     discontinued
 
diff --git a/Casks/adoptopenjdk15-openj9-jre-large.rb b/Casks/adoptopenjdk15-openj9-jre-large.rb
index 4fc6b082..63922921 100644
--- a/Casks/adoptopenjdk15-openj9-jre-large.rb
+++ b/Casks/adoptopenjdk15-openj9-jre-large.rb
@@ -18,7 +18,7 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.15-openj9.jre"
-  
+
   caveats do
     discontinued
 
diff --git a/Casks/adoptopenjdk15-openj9-large.rb b/Casks/adoptopenjdk15-openj9-large.rb
index 66e0f78f..b0c7650a 100644
--- a/Casks/adoptopenjdk15-openj9-large.rb
+++ b/Casks/adoptopenjdk15-openj9-large.rb
@@ -18,7 +18,7 @@
   end
 
   uninstall pkgutil: "net.adoptopenjdk.15-openj9.jdk"
-  
+
   caveats do
     discontinued