From 81a10012a7015083c376856ca3626abe04e5fe5e Mon Sep 17 00:00:00 2001
From: Florian Cramer <florian.cramer.112@gmail.com>
Date: Wed, 11 Oct 2023 21:56:35 +0200
Subject: [PATCH 1/3] temurin: Add version 21

---
 bucket/temurin21-jdk.json | 40 +++++++++++++++++++++++++++++++++++++++
 bucket/temurin21-jre.json | 40 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 bucket/temurin21-jdk.json
 create mode 100644 bucket/temurin21-jre.json

diff --git a/bucket/temurin21-jdk.json b/bucket/temurin21-jdk.json
new file mode 100644
index 00000000000..68e4ec0ad21
--- /dev/null
+++ b/bucket/temurin21-jdk.json
@@ -0,0 +1,40 @@
+{
+    "description": "Eclipse Temurin is a runtime provided by Eclipse Adoptium for general use across the Java ecosystem",
+    "homepage": "https://adoptium.net",
+    "version": "21.0.1-12.1.LTS",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1+12/OpenJDK21U-jdk_x64_windows_hotspot_21.0.1_12.zip",
+            "hash": "36555fd6a1a628abf8063b7781309895a94680c13a0e620013ff44bfdc18d8bd"
+        }
+    },
+    "extract_dir": "jdk-21.0.1+12",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.adoptium.net/v3/assets/feature_releases/21/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=eclipse&page_size=1&sort_order=DESC",
+        "script": [
+            "$ver = (json_path $page $..version_data.semver).replace('+', '-')",
+            "$link = (json_path $page $..release_link).replace('%2B', '+')",
+            "$name = json_path $page $..binaries[0].package.name",
+            "Write-Output \"$ver $link $name\""
+        ],
+        "regex": "(?<ver>.*?) https://github.com/(?<link>.*?)/tag/(?<tag>.*?) (?<name>(?<prefix>OpenJDK[\\dU]*-[dejkr]{3})_x64_(?<suffix>.*))",
+        "replace": "${ver}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/$matchLink/download/$matchTag/$matchName"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256.txt",
+            "find": "^([a-fA-F0-9]+)\\s"
+        },
+        "extract_dir": "$matchTag"
+    }
+}
diff --git a/bucket/temurin21-jre.json b/bucket/temurin21-jre.json
new file mode 100644
index 00000000000..35d1b388788
--- /dev/null
+++ b/bucket/temurin21-jre.json
@@ -0,0 +1,40 @@
+{
+    "description": "Eclipse Temurin is a runtime provided by Eclipse Adoptium for general use across the Java ecosystem",
+    "homepage": "https://adoptium.net",
+    "version": "21.0.1-12.1.LTS",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1+12/OpenJDK21U-jre_x64_windows_hotspot_21.0.1_12.zip",
+            "hash": "38bb68f9db9c85a63496570c53a1bcbac18c808677595d7e939d2f5b38e9a7aa"
+        }
+    },
+    "extract_dir": "jdk-21.0.1+12-jre",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.adoptium.net/v3/assets/feature_releases/21/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=eclipse&page_size=1&sort_order=DESC",
+        "script": [
+            "$ver = (json_path $page $..version_data.semver).replace('+', '-')",
+            "$link = (json_path $page $..release_link).replace('%2B', '+')",
+            "$name = json_path $page $..binaries[0].package.name",
+            "Write-Output \"$ver $link $name\""
+        ],
+        "regex": "(?<ver>.*?) https://github.com/(?<link>.*?)/tag/(?<tag>.*?) (?<name>(?<prefix>OpenJDK[\\dU]*-[dejkr]{3})_x64_(?<suffix>.*))",
+        "replace": "${ver}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/$matchLink/download/$matchTag/$matchName"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256.txt",
+            "find": "^([a-fA-F0-9]+)\\s"
+        },
+        "extract_dir": "$matchTag-jre"
+    }
+}

From 982d56b3e830f57f51bc31d563814eca875ca386 Mon Sep 17 00:00:00 2001
From: Mathias Hermansson <mathias.hermansson@se.ibm.com>
Date: Tue, 31 Oct 2023 16:35:31 +0100
Subject: [PATCH 2/3] Remove LTS from version

---
 bucket/temurin21-jdk.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bucket/temurin21-jdk.json b/bucket/temurin21-jdk.json
index 68e4ec0ad21..99caed34af8 100644
--- a/bucket/temurin21-jdk.json
+++ b/bucket/temurin21-jdk.json
@@ -1,7 +1,7 @@
 {
     "description": "Eclipse Temurin is a runtime provided by Eclipse Adoptium for general use across the Java ecosystem",
     "homepage": "https://adoptium.net",
-    "version": "21.0.1-12.1.LTS",
+    "version": "21.0.1-12.1",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
@@ -17,7 +17,7 @@
     "checkver": {
         "url": "https://api.adoptium.net/v3/assets/feature_releases/21/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=eclipse&page_size=1&sort_order=DESC",
         "script": [
-            "$ver = (json_path $page $..version_data.semver).replace('+', '-')",
+            "$ver = (json_path $page $..version_data.semver).replace('+', '-').replace('.LTS', '')",
             "$link = (json_path $page $..release_link).replace('%2B', '+')",
             "$name = json_path $page $..binaries[0].package.name",
             "Write-Output \"$ver $link $name\""

From e68a68ac40064bfeec7812cc20e7252b1a28fcce Mon Sep 17 00:00:00 2001
From: Mathias Hermansson <mathias.hermansson@se.ibm.com>
Date: Tue, 31 Oct 2023 16:36:11 +0100
Subject: [PATCH 3/3] Remove LTS from version

---
 bucket/temurin21-jre.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bucket/temurin21-jre.json b/bucket/temurin21-jre.json
index 35d1b388788..164097a2f72 100644
--- a/bucket/temurin21-jre.json
+++ b/bucket/temurin21-jre.json
@@ -1,7 +1,7 @@
 {
     "description": "Eclipse Temurin is a runtime provided by Eclipse Adoptium for general use across the Java ecosystem",
     "homepage": "https://adoptium.net",
-    "version": "21.0.1-12.1.LTS",
+    "version": "21.0.1-12.1",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
@@ -17,7 +17,7 @@
     "checkver": {
         "url": "https://api.adoptium.net/v3/assets/feature_releases/21/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=eclipse&page_size=1&sort_order=DESC",
         "script": [
-            "$ver = (json_path $page $..version_data.semver).replace('+', '-')",
+            "$ver = (json_path $page $..version_data.semver).replace('+', '-').replace('.LTS', '')",
             "$link = (json_path $page $..release_link).replace('%2B', '+')",
             "$name = json_path $page $..binaries[0].package.name",
             "Write-Output \"$ver $link $name\""