From adc1f09ad0f1698c39eb509f920b193a2cc57692 Mon Sep 17 00:00:00 2001
From: Nicolas PITHON <nicolas.pithon@fabernovel.com>
Date: Thu, 14 Nov 2019 11:56:03 +0100
Subject: [PATCH 1/2] Add the repo for install openjdk8 on Debian buster

---
 defaults/main.yml |  8 ++++++++
 tasks/openjdk.yml | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index f80c732..cc1c99e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -58,6 +58,14 @@ apt_openjdk_packages:
       - stretch
     use_apt_packages:
       - default-jre
+  - use_apt_codenames:
+      - buster
+    apt_repos:
+      - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main
+    apt_key_url: "https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public"
+    apt_key_id: "8ED17AF5D7E675EB3EE3BCE98AC3B29174885C03"
+    use_apt_packages:
+      - adoptopenjdk-8-hotspot-jre
 
 # Java profile
 oracle_java_profile: /etc/profile.d
diff --git a/tasks/openjdk.yml b/tasks/openjdk.yml
index 5e104ee..1711bed 100644
--- a/tasks/openjdk.yml
+++ b/tasks/openjdk.yml
@@ -3,9 +3,19 @@
 - name: Set Java Apt Repos
   set_fact:
     use_java_apt_repos: "{{ item.apt_repos }}"
+    use_java_apt_key_url: "{{ item.apt_key_url | default(None) }}"
+    use_java_apt_key_id: "{{ item.apt_key_id | default(None) }}"
   with_items: "{{ apt_openjdk_packages }}"
   when: install_java and ansible_lsb.codename | lower in item.use_apt_codenames and item.apt_repos is defined
 
+- name: Add Java repository key
+  apt_key:
+    url: '{{ use_java_apt_key_url }}'
+    id: '{{ use_java_apt_key_id }}'
+    state: present
+  when: use_java_apt_repos is defined and use_java_apt_key_url is defined and use_java_apt_key_id is defined
+  become: yes
+
 - name: Add Java repo
   apt_repository:
     repo: "{{ item }}"

From 5c907b04129e5f5ab842d5b9c32d082ec4199b34 Mon Sep 17 00:00:00 2001
From: npi <nicolas.pithon@fabernovel.com>
Date: Mon, 17 Feb 2020 15:35:45 +0100
Subject: [PATCH 2/2] Modify default java_installer_type to openjdk

---
 defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index cc1c99e..74b18a0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,7 @@
 apt_cache_valid_time: 600
 
 # Java Installer Type
-java_installer_type: oracle_ppa  # oracle_ppa, oracle_url, oracle_file, openjdk
+java_installer_type: openjdk  # oracle_ppa, oracle_url, oracle_file, openjdk
 
 # Oracle Java PPA
 apt_java_repo: ppa:webupd8team/java