From 787d6f6ee7e52e260bb0d69c83277ef5308e4ce6 Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Mon, 6 Jun 2022 12:49:12 +0200
Subject: [PATCH] [Ubuntu] install Temurin gpg key manually on 22.04 (#5676)

---
 images/linux/scripts/installers/java-tools.sh | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index d5ccd1c7c..527d27e55 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -38,20 +38,24 @@ createJavaEnvironmentalVariable() {
 }
 
 enableRepositories() {
+
+osLabel=$(getOSVersionLabel)
+
     if isUbuntu18 || isUbuntu20; then
         # Add Adopt PPA
-        wget -qO - "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public" | apt-key add -
-        add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+        wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adopt.gpg
+        echo "deb [signed-by=/usr/share/keyrings/adopt.gpg] https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ $osLabel main" > /etc/apt/sources.list.d/adopt.list
     fi
 
     # Add Addoptium PPA
-    wget -qO - "https://packages.adoptium.net/artifactory/api/gpg/key/public" | apt-key add -
-    add-apt-repository --yes https://packages.adoptium.net/artifactory/deb/
+    # apt-key is deprecated, dearmor and add manually
+    wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor > /usr/share/keyrings/adoptium.gpg
+    echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb/ $osLabel main" > /etc/apt/sources.list.d/adoptium.list
 
     if 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 https://repos.azul.com/azure-only/zulu/apt stable main"
+        wget -qO - https://www.azul.com/wp-content/uploads/2021/05/0xB1998361219BD9C9.txt | gpg --dearmor > /usr/share/keyrings/zulu.gpg
+        echo "deb [signed-by=/usr/share/keyrings/zulu.gpg] https://repos.azul.com/azure-only/zulu/apt stable main" > /etc/apt/sources.list.d/zulu.list
     fi
 }
 
@@ -152,5 +156,13 @@ unzip -qq -d /usr/share /tmp/gradleLatest.zip
 ln -s /usr/share/gradle-"${gradleLatestVersion}"/bin/gradle /usr/bin/gradle
 echo "GRADLE_HOME=$(find /usr/share -depth -maxdepth 1 -name "gradle*")" | tee -a /etc/environment
 
+# Delete java repositories and keys
+rm -f /etc/apt/sources.list.d/adopt.list
+rm -f /etc/apt/sources.list.d/adoptium.list
+rm -f /etc/apt/sources.list.d/zulu.list
+rm -f /usr/share/keyrings/adopt.gpg
+rm -f /usr/share/keyrings/adoptium.gpg
+rm -f /usr/share/keyrings/zulu.gpg
+
 reloadEtcEnvironment
 invoke_tests "Java"