Improved vendor support

Author: vicsufer

defaults/main.yml

@@ -1,2 +1,5 @@
 ---
 java_jdk_vendor: openjdk
+
+java_open_jdk_apt_extra_packages: []
+java_open_jdk_home: /usr/lib/jvm/{{ java_open_jdk_home_dir }}

molecule/default/verify.yml

@@ -27,13 +27,10 @@
 
   tasks:
     - name: Java | Gather OS specific variables
-      include_vars: "../../vars/os-distributions/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+      include_vars: "../../vars/{{  java_jdk_vendor  }}/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
     # Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
     # Allowing to 'override' variables that are defined using include_vars
 
-    - name: Java | Gather JDK build variables
-      include_vars: "../../vars/jdk-builds/{{ java_jdk_vendor }}.yml"
-
     - name: Java | Setting OS specific variables
       set_fact:
         java_open_jdk_version: "{{ java_open_jdk_version if java_open_jdk_version is defined and java_open_jdk_version is not sameas None }}"

tasks/install_openjdk.yml

@@ -3,12 +3,7 @@
 - name: Java | Gather OS specific variables
   include_vars: "{{ item }}"
   with_first_found:
-    - "os-distributions/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
-
-- name: Java | Gather JDK build specific variables
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "jdk-builds/{{ java_jdk_vendor }}.yml"
+    - "{{ java_jdk_vendor }}/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
 
 # Using pattern described in Ansible Best Practices and Conventions (Appendix B), Ansible for Devops (p. 406)
 # Allowing to 'override' variables that are defined using include_vars

vars/adoptopenjdk/Centos-8.yml

@@ -0,0 +1,15 @@
+---
+__java_open_jdk_apt_extra_packages:
+  - python-apt
+  - apt-transport-https
+__java_open_jdk_version_major: 8
+# Supported major releases: 8 and from 11 to 14; hotspot and openj9 implementations
+
+__java_required_repositories_openjdk:
+  - { name: "AdoptOpenJDK", baseurl: "http://adoptopenjdk.jfrog.io/adoptopenjdk/rpm/centos/$releasever/$basearch" }
+__java_open_jdk_home_dir: adoptopenjdk-{{ java_open_jdk_version_major }}-hotspot
+
+__java_required_key_repositories_openjdk:
+  - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
+__java_open_jdk_package: adoptopenjdk-{{ java_open_jdk_version_major }}-hotspot
+__java_open_jdk_home: /usr/lib/jvm/{{ java_open_jdk_home_dir }}

vars/adoptopenjdk/Debian-10.yml

@@ -0,0 +1,22 @@
+---
+__java_open_jdk_apt_extra_packages:
+  - python-apt
+  - apt-transport-https
+__java_open_jdk_version_major: 8
+# Supported major releases: 8 and from 11 to 14; hotspot and openj9 implementations
+
+# For Debian family
+__java_required_repositories_openjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main
+__java_required_libs_openjdk: []
+__java_open_jdk_home_dir: adoptopenjdk-{{ java_open_jdk_version_major }}-hotspot-amd64
+
+# For RHEL family
+# __java_required_repositories_openjdk:
+#   - { name: "AdoptOpenJDK", baseurl: "http://adoptopenjdk.jfrog.io/adoptopenjdk/rpm/centos/$releasever/$basearch" }
+# __java_open_jdk_home_dir: adoptopenjdk-{{ java_open_jdk_version_major }}-hotspot
+
+__java_required_key_repositories_openjdk:
+  - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
+__java_open_jdk_package: adoptopenjdk-{{ java_open_jdk_version_major }}-hotspot
+__java_open_jdk_home: /usr/lib/jvm/{{ java_open_jdk_home_dir }}

vars/corretto/CentOS-8.yml

@@ -0,0 +1,13 @@
+---
+
+__java_open_jdk_version_major: 11
+# Supported versions: 8 (1.8.0 in RHEL), 11
+
+__java_required_repositories_openjdk:
+  - { name: "AmazonCorretto", baseurl: "https://yum.corretto.aws/$basearch" }
+__java_required_key_repositories_openjdk:
+  - https://yum.corretto.aws/corretto.key
+__java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-devel
+
+java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto
+java_open_jdk_home: /usr/lib/jvm/{{ java_open_jdk_home_dir }}

vars/corretto/Debian-10.yml

@@ -0,0 +1,15 @@
+---
+
+__java_open_jdk_version_major: 11
+# Supported versions: 8 (1.8.0 in RHEL), 11
+
+__java_required_repositories_openjdk:
+ - deb https://apt.corretto.aws stable main
+__java_required_key_repositories_openjdk:
+  - https://apt.corretto.aws/corretto.key
+__java_required_libs_openjdk:
+  - apt-transport-https
+__java_open_jdk_package: java-{{ java_open_jdk_version_major }}-amazon-corretto-jdk
+
+java_open_jdk_home_dir: java-{{ java_open_jdk_version_major }}-amazon-corretto
+java_open_jdk_home: /usr/lib/jvm/{{ java_open_jdk_home_dir }}