From ec552526c974bbebb47edbe4a70817c90c0042ab Mon Sep 17 00:00:00 2001
From: Lee Goolsbee <lgoolsbee@atlassian.com>
Date: Wed, 22 Jun 2022 16:23:11 -0500
Subject: [PATCH] Switch from deprecated adoptopenjdk to eclipse-temurin jdk

---
 roles/product_common/tasks/amazon.yml | 20 ++++++++++----------
 roles/product_common/tasks/ubuntu.yml | 18 +++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/roles/product_common/tasks/amazon.yml b/roles/product_common/tasks/amazon.yml
index fad01a6..41e75e1 100644
--- a/roles/product_common/tasks/amazon.yml
+++ b/roles/product_common/tasks/amazon.yml
@@ -1,28 +1,28 @@
 ---
 
-- name: Add AdoptOpenJDK repo and install if necessary on Amazon Linux
+- name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Amazon Linux
   block:
 
-    - name: Add AdoptOpenJDK yum repository
+    - name: Add Adoptium yum repository
       yum_repository:
-        name: AdoptOpenJDK
-        file: adoptopenjdk
-        description: AdoptOpenJDK Repo
-        baseurl: "https://adoptopenjdk.jfrog.io/adoptopenjdk/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}/"
-        gpgkey: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
+        name: Adoptium
+        file: adoptium
+        description: Adoptium Repo
+        baseurl: "https://packages.adoptium.net/artifactory/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}"
+        gpgkey: https://packages.adoptium.net/artifactory/api/gpg/key/public
         gpgcheck: yes
         state: present
 
-    - name: Install AdoptOpenJDK
+    - name: Install Eclipse Temurin JDK
       yum:
-        name: "adoptopenjdk-{{ java_major_version }}-hotspot"
+        name: "temurin-{{ java_major_version }}-jdk"
         state: present
 
     - name: Ensure common JDK symlink exists
       alternatives:
         link: "/usr/lib/jvm/java"
         name: "java_sdk"
-        path: "/usr/lib/jvm/adoptopenjdk-{{ java_major_version }}-hotspot"
+        path: "/usr/lib/jvm/temurin-{{ java_major_version }}-jdk"
         priority: 99
 
   when: atl_use_system_jdk
diff --git a/roles/product_common/tasks/ubuntu.yml b/roles/product_common/tasks/ubuntu.yml
index c90b6bc..7a8a9b1 100644
--- a/roles/product_common/tasks/ubuntu.yml
+++ b/roles/product_common/tasks/ubuntu.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: Add AdoptOpenJDK repo and install if necessary on Ubuntu
+- name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Ubuntu
   block:
 
     - name: Install gnupg
@@ -8,20 +8,20 @@
         name: gnupg
         state: present
 
-    - name: Add AdoptOpenJDK debian repo public key
+    - name: Add Adoptium debian repo public key
       apt_key:
-        url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
+        url: https://packages.adoptium.net/artifactory/api/gpg/key/public
         state: present
 
-    - name: Add AdoptOpenJDK debian repository
+    - name: Add Adoptium debian repository
       apt_repository:
-        repo: "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb {{ ansible_distribution_release }} main"
+        repo: "deb https://packages.adoptium.net/artifactory/deb {{ ansible_distribution_release }} main"
         state: present
-        filename: adoptopenjdk
+        filename: adoptium
 
-    - name: Install AdoptOpenJDK
+    - name: Install Eclipse Temurin JDK
       apt:
-        name: "adoptopenjdk-{{ java_major_version }}-hotspot"
+        name: "temurin-{{ java_major_version }}-jdk"
         update_cache: yes
         state: present
 
@@ -29,7 +29,7 @@
       alternatives:
         link: "/usr/lib/jvm/java"
         name: "java_sdk"
-        path: "/usr/lib/jvm/adoptopenjdk-{{ java_major_version }}-hotspot-{{ debian_architecture }}"
+        path: "/usr/lib/jvm/temurin-{{ java_major_version }}-jdk-{{ debian_architecture }}"
         priority: 99
 
   when: atl_use_system_jdk