From b5637bcffc18777dec03a9d59f2afb9b4aa8f0aa Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Wed, 6 Nov 2024 13:48:16 +0200 Subject: [PATCH] Update Java version into 17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Jenkins needs version 17 to get agent running in VM Task-number: QTQAINFRA-6263 Change-Id: I57daadad6baa2e7e538874769af3fbe0cdd42878 Reviewed-by: Ville-Pekka Karhu Reviewed-by: Tero Heikkinen (cherry picked from commit 5128df0130a599a81226b1e38be9ef0cf3d73455) Reviewed-by: Aku Pietikäinen Reviewed-by: Jukka Jokiniva --- coin/provisioning/common/macos/java_arm.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/macos/java_arm.sh b/coin/provisioning/common/macos/java_arm.sh index 1c4b1ed1..2957d81a 100755 --- a/coin/provisioning/common/macos/java_arm.sh +++ b/coin/provisioning/common/macos/java_arm.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2021 The Qt Company Ltd. +# Copyright (C) 2024 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only # This script installs JDK @@ -8,10 +8,10 @@ set -ex echo "Installing Java Development Kit" -targetFile=zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg +targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac -# url_alt=https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg +# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg echo "Mounting $targetFile" sudo mkdir -p /Volumes/files @@ -22,12 +22,12 @@ sudo umount /Volumes/files sudo hdiutil attach "/tmp/$targetFile" echo Installing JDK -cd /Volumes/Zulu\ OpenJDK\ 15.29+15 && sudo installer -pkg Double-Click\ to\ Install\ Zulu\ 15.pkg -target / +cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target / echo "Unmounting $targetFile" -sudo hdiutil unmount /Volumes/Zulu\ OpenJDK\ 15.29+15 -force +sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force echo "Disable auto update" sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false -echo "JDK Version = 15.0.2" >> ~/versions.txt +echo "JDK Version = 17.0.13" >> ~/versions.txt