From 8feda606454a87273edff387d8a45414a1344061 Mon Sep 17 00:00:00 2001
From: Mathias Hermansson <mathias.hermansson@se.ibm.com>
Date: Fri, 24 Apr 2020 18:42:00 +0200
Subject: [PATCH] adopt*-upstream: Change to AdoptOpenJDK API v3 (#174)

---
 bucket/adopt11-upstream.json      | 7 ++++---
 bucket/adopt8-upstream.json       | 7 ++++---
 bucket/adoptopenjdk-upstream.json | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/bucket/adopt11-upstream.json b/bucket/adopt11-upstream.json
index 39d13c8f1..3c1ff67d5 100644
--- a/bucket/adopt11-upstream.json
+++ b/bucket/adopt11-upstream.json
@@ -15,9 +15,10 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "github": "https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries",
-        "re": "jdk-(?<major>(?<jdk>[\\d]+)[\\d.]+)(?:\\%2B|\\+)(?<build>[\\d]+)",
-        "replace": "${major}-${build}"
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/11/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=openjdk&page_size=1&sort_order=DESC",
+        "jp": "$..binaries[0].package.link",
+        "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]*)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)))/",
+        "replace": "${major}-${build}${patch}"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/adopt8-upstream.json b/bucket/adopt8-upstream.json
index d49448644..66d8daf56 100644
--- a/bucket/adopt8-upstream.json
+++ b/bucket/adopt8-upstream.json
@@ -15,9 +15,10 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "github": "https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries",
-        "re": "jdk(?<major>[\\d]+)(?<update>u[\\d]+)-(?<build>b[\\d]+)",
-        "replace": "${major}${update}-${build}"
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/8/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=openjdk&page_size=1&sort_order=DESC",
+        "jp": "$..binaries[0].package.link",
+        "re": "https://github.com/(?<url>.*?(?<tag>jdk(?<major>[\\d]+)(?<update>u[\\d]+)-(?<build>b[\\d]+)(?<patch>[\\d.]*)))/",
+        "replace": "${major}${update}-${build}${patch}"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/adoptopenjdk-upstream.json b/bucket/adoptopenjdk-upstream.json
index 2efb07829..44cd10f12 100644
--- a/bucket/adoptopenjdk-upstream.json
+++ b/bucket/adoptopenjdk-upstream.json
@@ -15,9 +15,10 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "github": "https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries",
-        "re": "jdk-(?<major>(?<jdk>[\\d]+)[\\d.]+)(?:\\%2B|\\+)(?<build>[\\d]+)",
-        "replace": "${major}-${build}"
+        "url": "https://api.adoptopenjdk.net/v3/assets/version/%5B8%2C%29?release_type=ga&jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=openjdk&page_size=1&sort_order=DESC",
+        "jp": "$..binaries[0].package.link",
+        "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]*)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)))/",
+        "replace": "${major}-${build}${patch}"
     },
     "autoupdate": {
         "architecture": {