From f342a7de2d1a5753a866a5ba8d4fffabc2d2b513 Mon Sep 17 00:00:00 2001
From: Darii Nurgaleev <50947177+Darleev@users.noreply.github.com>
Date: Wed, 24 Jun 2020 15:37:04 +0700
Subject: [PATCH] Add Adopt Open JDK for Ubuntu. (#1060)

* added Adopt Open JDK for Ubuntu.

* added default java for ubuntu 20

* moved Azul Keys to ubuntu 16,18

* Documentation description

* set default java version.

* Added documentation part for Azul Zulu.

* remove java 13,14

* moved apt-get update.

* removed 12 jdk for ubuntu 20.

* java 12 documentation

* java 12 only on ubuntu 16 18
---
 images/linux/scripts/installers/java-tools.sh | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index ffc57f73..aafed29f 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -10,14 +10,18 @@ source $HELPER_SCRIPTS/os.sh
 
 set -e
 
-# Install the Azul Systems Zulu JDKs
-# See https://www.azul.com/downloads/azure-only/zulu/
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
-apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main"
-apt-get -q update
+# Install GPG Key for Adopt Open JDK. See https://adoptopenjdk.net/installation.html
+wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add -
+add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
 
 if isUbuntu16 || isUbuntu18 ; then
+    # Install GPG Key for Azul Open JDK. See https://www.azul.com/downloads/azure-only/zulu/
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main"
+    apt-get update
     apt-get -y install zulu-7-azure-jdk=\*
+    # Open JDP Adopt does not exist for Ubuntu 20
+    apt-get -y install adoptopenjdk-12-hotspot=\*
     echo "JAVA_HOME_7_X64=/usr/lib/jvm/zulu-7-azure-amd64" | tee -a /etc/environment
     DEFAULT_JDK_VERSION=8
     defaultLabel8="(default)"
@@ -26,17 +30,22 @@ fi
 if isUbuntu20 ; then
     DEFAULT_JDK_VERSION=11
     defaultLabel11="(default)"
+    apt-get update
 fi
 
-apt-get -y install zulu-8-azure-jdk=\*
-apt-get -y install zulu-11-azure-jdk=\*
-apt-get -y install zulu-12-azure-jdk=\*
-update-java-alternatives -s /usr/lib/jvm/zulu-8-azure-amd64
+# Install only LTS versions.
+apt-get -y install adoptopenjdk-8-hotspot=\*
+apt-get -y install adoptopenjdk-11-hotspot=\*
 
-echo "JAVA_HOME_8_X64=/usr/lib/jvm/zulu-8-azure-amd64" | tee -a /etc/environment
-echo "JAVA_HOME_11_X64=/usr/lib/jvm/zulu-11-azure-amd64" | tee -a /etc/environment
-echo "JAVA_HOME_12_X64=/usr/lib/jvm/zulu-12-azure-amd64" | tee -a /etc/environment
-echo "JAVA_HOME=/usr/lib/jvm/zulu-${DEFAULT_JDK_VERSION}-azure-amd64" | tee -a /etc/environment
+# Set Default Java version.
+update-java-alternatives -s /usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64
+
+echo "JAVA_HOME_8_X64=/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64" | tee -a /etc/environment
+echo "JAVA_HOME_11_X64=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64" | tee -a /etc/environment
+if isUbuntu16 || isUbuntu18 ; then
+echo "JAVA_HOME_12_X64=/usr/lib/jvm/adoptopenjdk-12-hotspot-amd64" | tee -a /etc/environment
+fi
+echo "JAVA_HOME=/usr/lib/jvm/adoptopenjdk-${DEFAULT_JDK_VERSION}-hotspot-amd64" | tee -a /etc/environment
 echo "JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8" | tee -a /etc/environment
 
 # Install Ant
@@ -79,13 +88,16 @@ done
 
 # Document what was added to the image
 echo "Lastly, documenting what we added to the metadata file"
-DocumentInstalledItem "Azul Zulu OpenJDK:"
 if isUbuntu16 || isUbuntu18 ; then
+DocumentInstalledItem "Azul Zulu OpenJDK:"
 DocumentInstalledItemIndent "7 ($(/usr/lib/jvm/zulu-7-azure-amd64/bin/java -showversion |& head -n 1))"
 fi
-DocumentInstalledItemIndent "8 ($(/usr/lib/jvm/zulu-8-azure-amd64/bin/java -showversion |& head -n 1)) $defaultLabel8"
-DocumentInstalledItemIndent "11 ($(/usr/lib/jvm/zulu-11-azure-amd64/bin/java -showversion |& head -n 1)) $defaultLabel11"
-DocumentInstalledItemIndent "12 ($(/usr/lib/jvm/zulu-12-azure-amd64/bin/java -showversion |& head -n 1))"
+DocumentInstalledItem "Adopt OpenJDK:"
+DocumentInstalledItemIndent "8 ($(/usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java -showversion |& head -n 1)) $defaultLabel8"
+DocumentInstalledItemIndent "11 ($(/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/java -showversion |& head -n 1)) $defaultLabel11"
+if isUbuntu16 || isUbuntu18 ; then
+DocumentInstalledItemIndent "12 ($(/usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/bin/java -showversion |& head -n 1))"
+fi
 DocumentInstalledItem "Ant ($(ant -version))"
 DocumentInstalledItem "Gradle ${gradleVersion}"
 DocumentInstalledItem "Maven ($(mvn -version | head -n 1))"