diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index fcecff18481..139c1582c97 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -3,10 +3,10 @@ set -e case "$1" in java17) - echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/17.0.3+7/bellsoft-jdk17.0.3+7-linux-amd64.tar.gz" ;; java18) - echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_x64_linux_hotspot_18.0.1_10.tar.gz" + echo "https://github.com/bell-sw/Liberica/releases/download/18.0.1+12/bellsoft-jdk18.0.1+12-linux-amd64.tar.gz" ;; *) echo $"Unknown java version" diff --git a/ci/scripts/detect-jdk-updates.sh b/ci/scripts/detect-jdk-updates.sh index 3d67c7773ea..cec7502902e 100755 --- a/ci/scripts/detect-jdk-updates.sh +++ b/ci/scripts/detect-jdk-updates.sh @@ -8,20 +8,12 @@ report_error() { trap 'report_error $? $LINENO' ERR case "$JDK_VERSION" in - java8) - BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/8/ga" - ISSUE_TITLE="Upgrade Java 8 version in CI image" - ;; - java11) - BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/11/ga" - ISSUE_TITLE="Upgrade Java 11 version in CI image" - ;; java17) - BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/17/ga" + BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=17" ISSUE_TITLE="Upgrade Java 17 version in CI image" ;; java18) - BASE_URL="https://api.adoptium.net/v3/assets/feature_releases/18/ga" + BASE_URL="https://api.bell-sw.com/v1/liberica/releases?version-feature=18" ISSUE_TITLE="Upgrade Java 18 version in CI image" ;; *) @@ -29,8 +21,8 @@ case "$JDK_VERSION" in exit 1; esac -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" ) +response=$( curl -s ${BASE_URL}\&arch\=x86\&bitness\=64\&bundle-type\=jdk\&os\=linux\&package-type\=tar.gz\&version-modifier\=latest ) +latest=$( jq -r '.[0].downloadUrl' <<< "$response" ) if [[ ${latest} = "null" || ${latest} = "" ]]; then echo "Could not parse JDK response: $response" exit 1;