From 19a218dc8e3e3f7430882020bff6abcc4557e6d3 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Mon, 21 Sep 2020 23:14:51 -0700
Subject: [PATCH] Backport JDK 15 detection support

See gh-23433
---
 ci/scripts/detect-jdk-updates.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh
index d4bd7684f0..266d387b23 100755
--- a/ci/scripts/detect-jdk-updates.sh
+++ b/ci/scripts/detect-jdk-updates.sh
@@ -9,23 +9,23 @@ trap 'report_error $? $LINENO' ERR
 
 case "$JDK_VERSION" in
 	java8)
-		 BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/8"
+		 BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/8/ga"
 		 ISSUE_TITLE="Upgrade Java 8 version in CI image"
 	;;
 	java11)
-		 BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11"
+		 BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11/ga"
 		 ISSUE_TITLE="Upgrade Java 11 version in CI image"
 	;;
-	java14)
-		 BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14"
-		 ISSUE_TITLE="Upgrade Java 14 version in CI image"
+	java15)
+		 BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga"
+		 ISSUE_TITLE="Upgrade Java 15 version in CI image"
 	;;
 	*)
 		echo $"Unknown java version"
 		exit 1;
 esac
 
-response=$( curl -s ${BASE_URL}\/ga\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk )
+response=$( curl -s ${BASE_URL}\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk )
 latest=$( jq -r '.[0].binaries[0].package.link' <<< "$response" )
 if [[ ${latest} = "null" || ${latest} = "" ]]; then
 	echo "Could not parse JDK response: $response"