From 02c7fd9ecf53498b9a4e9a57e294ab8b2bde84a4 Mon Sep 17 00:00:00 2001
From: Steffen Lange <github@stelas.de>
Date: Tue, 10 May 2022 13:18:30 +0200
Subject: [PATCH] Adoptium: remove EOL release

---
 modules/AdoptiumOpenJDK11.php |  2 +-
 modules/AdoptiumOpenJDK16.php | 15 ---------------
 modules/AdoptiumOpenJDK17.php |  2 +-
 modules/AdoptiumOpenJDK8.php  |  2 +-
 4 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 modules/AdoptiumOpenJDK16.php

diff --git a/modules/AdoptiumOpenJDK11.php b/modules/AdoptiumOpenJDK11.php
index 9684f85..c601d34 100644
--- a/modules/AdoptiumOpenJDK11.php
+++ b/modules/AdoptiumOpenJDK11.php
@@ -2,7 +2,7 @@
 
 class AdoptiumOpenJDK11 extends PatchBase {
 	function __construct() {
-		parent::__construct('Eclipse Foundation', 'Adoptium OpenJDK', 'https://adoptium.net/releases.html?variant=openjdk11&jvmVariant=hotspot');
+		parent::__construct('Eclipse Foundation', 'Adoptium OpenJDK', 'https://adoptium.net/de/temurin/releases');
 		$this->patch->setBranch('Temurin 11');
 	}
 	function check() : bool {
diff --git a/modules/AdoptiumOpenJDK16.php b/modules/AdoptiumOpenJDK16.php
deleted file mode 100644
index 8309395..0000000
--- a/modules/AdoptiumOpenJDK16.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class AdoptiumOpenJDK16 extends PatchBase {
-	function __construct() {
-		parent::__construct('Eclipse Foundation', 'Adoptium OpenJDK', 'https://adoptium.net/releases.html?variant=openjdk16&jvmVariant=hotspot');
-		$this->patch->setBranch('Temurin 16');
-	}
-	function check() : bool {
-		if ($this->fetch_json('https://api.adoptium.net/v3/info/release_versions?heap_size=normal&image_type=jdk&page=0&page_size=10&project=jdk&release_type=ga&sort_method=DEFAULT&sort_order=DESC&vendor=adoptium&version=%5B16.0%2C16.1%29'))
-			return $this->parse_json('openjdk_version');
-		return false;
-	}
-}
-
-?>
diff --git a/modules/AdoptiumOpenJDK17.php b/modules/AdoptiumOpenJDK17.php
index c1a7c61..dbc3dba 100644
--- a/modules/AdoptiumOpenJDK17.php
+++ b/modules/AdoptiumOpenJDK17.php
@@ -2,7 +2,7 @@
 
 class AdoptiumOpenJDK17 extends PatchBase {
 	function __construct() {
-		parent::__construct('Eclipse Foundation', 'Adoptium OpenJDK', 'https://adoptium.net/releases.html?variant=openjdk17&jvmVariant=hotspot');
+		parent::__construct('Eclipse Foundation', 'Adoptium OpenJDK', 'https://adoptium.net/de/temurin/releases');
 		$this->patch->setBranch('Temurin 17');
 	}
 	function check() : bool {
diff --git a/modules/AdoptiumOpenJDK8.php b/modules/AdoptiumOpenJDK8.php
index 4f510f1..c076479 100644
--- a/modules/AdoptiumOpenJDK8.php
+++ b/modules/AdoptiumOpenJDK8.php
@@ -2,7 +2,7 @@
 
 class AdoptiumOpenJDK8 extends PatchBase {
 	function __construct() {
-		parent::__construct('Eclipse Foundation', 'Adoptium OpenJDK', 'https://adoptium.net/releases.html?variant=openjdk8&jvmVariant=hotspot');
+		parent::__construct('Eclipse Foundation', 'Adoptium OpenJDK', 'https://adoptium.net/de/temurin/releases');
 		$this->patch->setBranch('Temurin 8');
 	}
 	function check() : bool {