From: Lott, Christopher (cl778h) <cl778h@att.com>
Date: Fri, 9 Aug 2019 18:19:12 +0000 (-0400)
Subject: Remove Java 7 support from RedHat and Ubuntu
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=7646eb8bb74b070020d086f6df42dbc026761285;p=ansible%2Froles%2Fjava-install.git

Remove Java 7 support from RedHat and Ubuntu

Drop openjdk-7-jdk from Debian tasks
Drop java-1.7.0-openjdk-devel from RedHat tasks

Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: I05357f6a1b0ea494e3b140bb626b8fafffeac204
---

diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index 27b6105..77d660e 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -4,10 +4,9 @@
     repo: 'ppa:openjdk-r/ppa'
   become: true
 
-- name: Install OpenJDK 1.7.0, 1.8.0, 1.11 and 1.12
+- name: Install OpenJDK 1.8.0, 1.11 and 1.12
   apt:
     name:
-      - openjdk-7-jdk
       - openjdk-8-jdk
       - openjdk-11-jdk
       - openjdk-12-jdk
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 2bc1451..33e0a00 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -3,10 +3,9 @@
   package: name=epel-release state=present
   when: ansible_os_family == "RedHat"
 
-- name: Install OpenJDK 1.7.0, 1.8.0, 1.11 and 1.12
+- name: Install OpenJDK 1.8.0, 1.11 and 1.12
   yum:
     name:
-      - java-1.7.0-openjdk-devel
       - java-1.8.0-openjdk-devel
       - java-11-openjdk-devel
       - java-latest-openjdk-devel