Merge branch '2.4.x' into 2.5.x

Closes gh-27586
This commit is contained in:
Stephane Nicoll 2021-08-06 17:14:57 +02:00
commit a6c0288b4e
1 changed files with 5 additions and 5 deletions

View File

@ -9,19 +9,19 @@ trap 'report_error $? $LINENO' ERR
case "$JDK_VERSION" in case "$JDK_VERSION" in
java8) java8)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/8/ga" BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/8/ga"
ISSUE_TITLE="Upgrade Java 8 version in CI image" ISSUE_TITLE="Upgrade Java 8 version in CI image"
;; ;;
java11) java11)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11/ga" BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/11/ga"
ISSUE_TITLE="Upgrade Java 11 version in CI image" ISSUE_TITLE="Upgrade Java 11 version in CI image"
;; ;;
java16) java16)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/16/ga" BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/16/ga"
ISSUE_TITLE="Upgrade Java 16 version in CI image" ISSUE_TITLE="Upgrade Java 16 version in CI image"
;; ;;
java17) java17)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/17/ea" BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/17/ea"
ISSUE_TITLE="Upgrade Java 17 version in CI image" ISSUE_TITLE="Upgrade Java 17 version in CI image"
;; ;;
*) *)
@ -29,7 +29,7 @@ case "$JDK_VERSION" in
exit 1; exit 1;
esac esac
response=$( curl -s ${BASE_URL}\?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\=adoptium )
latest=$( jq -r '.[0].binaries[0].package.link' <<< "$response" ) latest=$( jq -r '.[0].binaries[0].package.link' <<< "$response" )
if [[ ${latest} = "null" || ${latest} = "" ]]; then if [[ ${latest} = "null" || ${latest} = "" ]]; then
echo "Could not parse JDK response: $response" echo "Could not parse JDK response: $response"