From a7a57c025ef8c49df2ea61a4808da7a1f32a2a85 Mon Sep 17 00:00:00 2001
From: Mathias Hermansson <mathias.hermansson@se.ibm.com>
Date: Wed, 7 Apr 2021 21:56:31 +0200
Subject: [PATCH] dragonwell*: Update regex (#272)

---
 bucket/dragonwell11.json |  8 ++++----
 bucket/dragonwell8.json  | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bucket/dragonwell11.json b/bucket/dragonwell11.json
index baee33e48..c45d5e138 100644
--- a/bucket/dragonwell11.json
+++ b/bucket/dragonwell11.json
@@ -1,12 +1,12 @@
 {
     "description": "Alibaba Dragonwell, a downstream version of OpenJDK, is the in-house OpenJDK implementation at Alibaba",
-    "version": "11.0.9.4-11.0.9",
+    "version": "11.0.10.5-11.0.10",
     "homepage": "https://www.aliyun.com/product/dragonwell",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/alibaba/dragonwell11/releases/download/dragonwell-11.0.9.4_jdk-11.0.9-ga/OpenJDK11U-jdk_x64_windows_dragonwell_dragonwell-11.0.9.4_11.0.9_0.zip",
-            "hash": "bcb894ed2b7bfe2aa2e0f8210fcebf1f63f6fd03b9e72b6ab3d2520cf166974a"
+            "url": "https://github.com/alibaba/dragonwell11/releases/download/dragonwell-11.0.10.5_jdk-11.0.10-ga/Alibaba_Dragonwell_11.0.10.5_windows_x64.zip",
+            "hash": "4a7c653ae89d2b94b2c459f656cf2f53dc899cca2b02f8b0947d3e65ddc768f1"
         }
     },
     "extract_to": "tmp",
@@ -22,7 +22,7 @@
     },
     "checkver": {
         "github": "https://github.com/alibaba/dragonwell11",
-        "regex": "(?<tag>dragonwell-(?<dragon>[\\d.]+)_jdk-(?<jdk>[\\d.]+)(?:(?<b>-[\\d+])|-ga))/(?<filename>OpenJDK11U-jdk_x64_windows.*?(?:[\\d._]+))\\.zip",
+        "regex": "(?<tag>dragonwell-(?<dragon>[\\d.]+)_jdk-(?<jdk>[\\d.]+)(?:(?<b>-[\\d+])|-ga))/(?<filename>Alibaba_Dragonwell_(?:[\\d.]+)_windows_x64)\\.zip",
         "replace": "${dragon}-${jdk}${b}"
     },
     "autoupdate": {
diff --git a/bucket/dragonwell8.json b/bucket/dragonwell8.json
index c8a685e04..2205c4572 100644
--- a/bucket/dragonwell8.json
+++ b/bucket/dragonwell8.json
@@ -1,12 +1,12 @@
 {
     "description": "Alibaba Dragonwell, a downstream version of OpenJDK, is the in-house OpenJDK implementation at Alibaba",
-    "version": "8.5.5-275",
+    "version": "8.6.6-282",
     "homepage": "https://www.aliyun.com/product/dragonwell",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/alibaba/dragonwell8/releases/download/dragonwell-8.5.5_jdk8u275-ga/Alibaba_Dragonwell_8.5.5-Experimental_Windows_x64.zip",
-            "hash": "1b7dfee90585c55cf1c6ce2f7229ad9da05e86c15d94aa687f2f789ad4364dad"
+            "url": "https://github.com/alibaba/dragonwell8/releases/download/dragonwell-8.6.6_jdk8u282-ga/Alibaba_Dragonwell_8.6.6_x64_windows.zip",
+            "hash": "16eefe64811b083e24ef77b28d33dccbc8f560e23ba6d36126eecee8674e2b6f"
         }
     },
     "extract_to": "tmp",
@@ -28,12 +28,12 @@
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/alibaba/dragonwell8/releases/download/$matchTag/Alibaba_Dragonwell_$matchDragon-Experimental_Windows_x64.zip"
+                "url": "https://github.com/alibaba/dragonwell8/releases/download/$matchTag/Alibaba_Dragonwell_$matchDragon_x64_windows.zip"
             }
         },
         "hash": {
-            "url": "https://github.com/alibaba/dragonwell8/releases/tag/$matchTag",
-            "find": "$sha256\\s+$basename"
+            "url": "$url.sha256.txt",
+            "regex": "$sha256"
         }
     }
 }