Commit 208b2d3b authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.1.x' into 2.2.x

Closes gh-19175
parents d8d7129f 6255c6b5
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
case "$JDK_VERSION" in case "$JDK_VERSION" in
java8) java8)
BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk8" BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/8"
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/v2/info/releases/openjdk11" BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/11"
ISSUE_TITLE="Upgrade Java 11 version in CI image" ISSUE_TITLE="Upgrade Java 11 version in CI image"
;; ;;
java13) java13)
BASE_URL="https://api.adoptopenjdk.net/v2/info/releases/openjdk13" BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/13"
ISSUE_TITLE="Upgrade Java 13 version in CI image" ISSUE_TITLE="Upgrade Java 13 version in CI image"
;; ;;
*) *)
...@@ -18,8 +18,8 @@ case "$JDK_VERSION" in ...@@ -18,8 +18,8 @@ case "$JDK_VERSION" in
exit 1; exit 1;
esac esac
response=$( curl -s ${BASE_URL}\?openjdk_impl\=hotspot\&os\=linux\&arch\=x64\&release\=latest\&type\=jdk ) response=$( curl -s ${BASE_URL}\/ga\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk )
latest=$( jq -r '.binaries[0].binary_link' <<< "$response" ) latest=$( jq -r '.[0].binaries[0].package.link' <<< "$response" )
current=$( git-repo/ci/images/get-jdk-url.sh ${JDK_VERSION} ) current=$( git-repo/ci/images/get-jdk-url.sh ${JDK_VERSION} )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment