From: Jeremy Phelps <jphelps@linuxfoundation.org>
Date: Tue, 18 Sep 2018 14:18:42 +0000 (-0500)
Subject: Remove JDK9 from Debian bits
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=fd5bf536138ed08b5e44f6c3360e2c97b26960cd;p=ansible%2Froles%2Fjava-install.git

Remove JDK9 from Debian bits

Java 9 is not supported by RedHat even and is not a long-term
support version in any case.

Change-Id: Ic518dcb7068f3f53ed2be0f9bace5b21333b6ff9
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
---

diff --git a/tasks/Debian-aarch64.yml b/tasks/Debian-aarch64.yml
index b685e55..e4170ac 100644
--- a/tasks/Debian-aarch64.yml
+++ b/tasks/Debian-aarch64.yml
@@ -7,13 +7,6 @@
   apt: name=openjdk-8-jdk state=present update_cache=yes
   become: true
 
-- name: Install Java 9 SDK
-  # openjdk-9 is not directly available via apt.  Point directly to a suitable
-  # deb and install.
-  apt:
-    deb: http://launchpadlibrarian.net/235290897/openjdk-9-jdk_9~b102-1_arm64.deb
-  become: true
-
 - name: Set Java path
   set_fact:
     java_path: /usr/lib/jvm/java-1.8.0-openjdk-arm64
diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index 6784e09..af56eb4 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -11,14 +11,6 @@
   apt: name=openjdk-8-jdk state=present update_cache=yes
   become: true
 
-- name: Install Java 9 SDK
-  apt:
-    name: openjdk-9-jdk
-    state: present
-    update_cache: true
-    dpkg_options: 'force-overwrite'
-  become: true
-
 - name: Set Java path
   set_fact:
     java_path: /usr/lib/jvm/java-1.8.0-openjdk-amd64