From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Thu, 15 Sep 2022 20:14:05 +0000 (-0700)
Subject: Feat: Upgrade RH systems to use JDK11 by default
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=01ed2393e46d12cefebb4fe6023e289e767be873;p=ansible%2Froles%2Fjava-install.git

Feat: Upgrade RH systems to use JDK11 by default

* Update RH based systems to use JDK11 as the default JDK
* Removes the javah alternative setting, if the alternatives are all set
  correctly we shouldn't need to specify this. Additionally javah has
  been dropped in JDK11 in favor of a native javac call

Change-Id: I28eb76821bfdc0c9bde67fa07c963cc25da3ea80
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 90dec8e..25e205b 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -21,6 +21,6 @@
   when: ansible_os_family == "RedHat" and ansible_distribution_major_version == "8"
   become: true
 
-- name: Set Java path for OpenJDK 1.8.0
+- name: Set Java path for OpenJDK 11
   set_fact:
-    java_path: /usr/lib/jvm/java-1.8.0-openjdk
+    java_path: /usr/lib/jvm/java-11-openjdk
diff --git a/tasks/main.yml b/tasks/main.yml
index 5ebbfe7..2f39063 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,7 +5,7 @@
     - '{{ ansible_distribution }}.yml'
     - '{{ ansible_os_family }}.yml'
 
-- name: Set Java 8 as default
+- name: Set default Java
   block:
     - name: Set java alternatives
       alternatives:
@@ -37,11 +37,6 @@
         name: javap
         link: /usr/bin/javap
         path: '{{ java_path }}/bin/javap'
-    - name: Set javah alternatives
-      alternatives:
-        name: javah
-        link: /usr/bin/javah
-        path: '{{ java_path }}/bin/javah'
     - name: Set java_sdk_openjdk alternatives
       alternatives:
         name: java_sdk_openjdk