From abd2e0b381a3b78b2c801c1d97e06bd6ff82bc3f Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Thu, 7 Oct 2021 14:36:00 +0300
Subject: Provisioning: Upgrade Java JDK to version 11

Pick-to: 6.2
Task-number: QTQAINFRA-4596
Change-Id: I5c67f220b5a1f3115032eb509d1d391cf1e520a6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 coin/provisioning/common/macos/java.sh                     | 14 +++++++-------
 coin/provisioning/common/windows/install-jdk.ps1           | 12 +++++++-----
 .../qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh      |  2 +-
 .../qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh      |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/coin/provisioning/common/macos/java.sh b/coin/provisioning/common/macos/java.sh
index 34cf8477..e848dc63 100755
--- a/coin/provisioning/common/macos/java.sh
+++ b/coin/provisioning/common/macos/java.sh
@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -38,11 +38,11 @@
 set -ex
 
 echo "Installing Java Development Kit"
-
-targetFile=jdk-8u102-macosx-x64.dmg
+version=11.0.12
+targetFile=jdk-${version}_osx-x64_bin.dmg
 
 url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
-# url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
+# url_alt=https://www.oracle.com/java/technologies/downloads/#java11-linux
 
 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
@@ -53,12 +53,12 @@ sudo umount /Volumes/files
 sudo hdiutil attach "/tmp/$targetFile"
 
 echo Installing JDK
-cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /
+cd /Volumes/JDK\ ${version} && sudo installer -package JDK\ ${version}.pkg -target /
 
 echo "Unmounting $targetFile"
-sudo hdiutil unmount /Volumes/JDK\ 8\ Update\ 102/ -force
+sudo hdiutil unmount /Volumes/JDK\ ${version} -force
 
 echo "Disable auto update"
 sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
 
-echo "JDK Version = 8 update 102" >> ~/versions.txt
+echo "JDK Version = ${version}" >> ~/versions.txt
diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1
index ce1abdd5..13a65018 100644
--- a/coin/provisioning/common/windows/install-jdk.ps1
+++ b/coin/provisioning/common/windows/install-jdk.ps1
@@ -35,19 +35,21 @@
 
 # This script will install Java SE
 
-$installdir = "C:\Program Files\Java\jdk1.8.0_144"
-
-$version = "8u144"
 if (Is64BitWinHost) {
+    $version = "11.0.12"
     $arch = "x64"
-    $sha1 = "adb03bc3f4b40bcb3227687860798981d58e1858"
+    $sha1 = "135ffd1c350509729551876232a5354070732e92"
 } else {
+    $version = "8u144"
     $arch = "i586"
     $sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc"
 }
 
+$installdir = "C:\Program Files\Java\jdk-$version"
+
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe"
-$official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
+# java 11: https://www.oracle.com/java/technologies/downloads/#java11-windows
+# java 8: $official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
 $javaPackage = "C:\Windows\Temp\jdk-$version.exe"
 
 Write-Host "Fetching Java SE $version..."
diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
index 0fdcd854..f15d54e3 100755
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
@@ -90,7 +90,7 @@ installPackages+=(libxshmfence-devel)
 installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
 # For Android builds
-installPackages+=(java-1.8.0-openjdk-devel)
+installPackages+=(java-11-openjdk-devel)
 # For receiving shasum
 installPackages+=(perl-Digest-SHA)
 # INTEGRITY requirements
diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
index 2c0b251b..601a69d6 100755
--- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
@@ -90,7 +90,7 @@ installPackages+=(libxshmfence-devel)
 installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
 # For Android builds
-installPackages+=(java-1.8.0-openjdk-devel)
+installPackages+=(java-11-openjdk-devel)
 # For receiving shasum
 installPackages+=(perl-Digest-SHA)
 # INTEGRITY requirements
-- 
cgit v1.2.3