From 4d55663ba491b94780e5a13ff63640eb926a2e28 Mon Sep 17 00:00:00 2001
From: xxx58 <59995142+xxx58@users.noreply.github.com>
Date: Fri, 15 Dec 2023 20:07:07 +0800
Subject: [PATCH 1/5] dele-install-java8.yml

---
 mini-seqware-install.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mini-seqware-install.yml b/mini-seqware-install.yml
index 59ffe6c..56d391a 100644
--- a/mini-seqware-install.yml
+++ b/mini-seqware-install.yml
@@ -7,7 +7,6 @@
 - hosts: master
   sudo: True
   roles:
-    - { role: java, java_provider: Oracle8 }
     - { role: seqware-code,
           seqware_provider: artifactory ,
           user_name: seqware,

From bd35e7d607e9c07bd83d7297bca45f164358d42d Mon Sep 17 00:00:00 2001
From: xxx58 <59995142+xxx58@users.noreply.github.com>
Date: Fri, 15 Dec 2023 20:10:45 +0800
Subject: [PATCH 2/5] Update cloudera.yml

---
 roles/java/tasks/cloudera.yml | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/roles/java/tasks/cloudera.yml b/roles/java/tasks/cloudera.yml
index 2736ab3..691561c 100644
--- a/roles/java/tasks/cloudera.yml
+++ b/roles/java/tasks/cloudera.yml
@@ -1,36 +1,2 @@
 ---
 # file: roles/java/tasks/cloudera.yml
-- name: Java | Get Java
-  get_url:
-    dest: '/tmp/oracle-j2sdk1.7_1.7.0+update25-1_amd64.deb'
-    url: 'http://archive.cloudera.com/cm5/ubuntu/lucid/amd64/cm/pool/contrib/o/oracle-j2sdk1.7/oracle-j2sdk1.7_1.7.0+update25-1_amd64.deb'
-
-- name: Java | Install Java
-  command: dpkg --skip-same-version -i /tmp/oracle-j2sdk1.7_1.7.0+update25-1_amd64.deb
-  register: dpkg_result
-  changed_when: "dpkg_result.stdout.startswith('Selecting')"
-
-- name: Java | Set up Java
-  command: 'update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-7-oracle-cloudera/jre/bin/java 2000'
-  when: dpkg_result.changed
-
-- name: Java | Set up Java
-  command: 'update-alternatives --set java /usr/lib/jvm/java-7-oracle-cloudera/jre/bin/java'
-  when: dpkg_result.changed
-  
-- name: Java | Set up Jar
-  command: 'update-alternatives --install /usr/bin/jar jar /usr/lib/jvm/java-7-oracle-cloudera/bin/jar 2000'
-  when: dpkg_result.changed
-
-- name: Java | Set up Jar
-  command: 'update-alternatives --set jar /usr/lib/jvm/java-7-oracle-cloudera/bin/jar'
-  when: dpkg_result.changed
-
-- name: Java | Set JAVA_HOME
-  lineinfile: 
-    line: 'JAVA_HOME=/usr/lib/jvm/java-7-oracle-cloudera'
-    dest: /etc/environment
-    state: present
-    create: yes
-
-

From 09cf8cc60b38f867ed92a99068ffa0b8c17f4ad1 Mon Sep 17 00:00:00 2001
From: xxx58 <59995142+xxx58@users.noreply.github.com>
Date: Fri, 15 Dec 2023 20:11:00 +0800
Subject: [PATCH 3/5] Update openjdk7.yml

---
 roles/java/tasks/openjdk7.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/roles/java/tasks/openjdk7.yml b/roles/java/tasks/openjdk7.yml
index 23a0e22..4e41e10 100644
--- a/roles/java/tasks/openjdk7.yml
+++ b/roles/java/tasks/openjdk7.yml
@@ -1,13 +1,3 @@
 ---
 # file: roles/java/tasks/openjdk7.yml
-- name: Java | Install OpenJDK runtime
-  apt: pkg=openjdk-7-jre-headless state=present update_cache=yes cache_valid_time=3600
 
-- name: Java | Install OpenJDK Java developer kit
-  apt: pkg=openjdk-7-jdk state=present update_cache=yes cache_valid_time=3600
-
-- name: Java | Install IcedTea plugin
-  apt: pkg=icedtea-7-plugin state=present update_cache=yes cache_valid_time=3600
-
-- name: Java | Set default Java
-  shell: update-java-alternatives --set java-1.7.0-openjdk-amd64

From ef11dce87581cd9ef17054f2276931aba29d5f8b Mon Sep 17 00:00:00 2001
From: xxx58 <59995142+xxx58@users.noreply.github.com>
Date: Fri, 15 Dec 2023 20:11:33 +0800
Subject: [PATCH 4/5] Update oracle8.yml

---
 roles/java/tasks/oracle8.yml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/roles/java/tasks/oracle8.yml b/roles/java/tasks/oracle8.yml
index 8aa53a1..7396e4e 100644
--- a/roles/java/tasks/oracle8.yml
+++ b/roles/java/tasks/oracle8.yml
@@ -1,26 +1,3 @@
 ---
 # file: roles/java/tasks/oracle8.yml
 
-- name: add repo for java 8
-  apt_repository: repo='ppa:webupd8team/java' state=present
-
-- name: set licence selected
-  shell: /bin/echo debconf shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
-  sudo: yes
-  changed_when: false
-
-- name: set licence seen
-  shell: /bin/echo debconf shared/accepted-oracle-license-v1-1 seen true | /usr/bin/debconf-set-selections
-  sudo: yes
-  changed_when: false
-
-- name: install java 8
-  apt: name=oracle-java8-installer state=latest update-cache=yes force=yes
-  sudo: yes
-
-- name: Java | Set JAVA_HOME
-  lineinfile:
-    line: 'JAVA_HOME=/usr/lib/jvm/java-8-oracle'
-    dest: /etc/environment
-    state: present
-    create: yes

From 4373c6d5f1208a70af20962f422f91d1b1013b86 Mon Sep 17 00:00:00 2001
From: xxx58 <59995142+xxx58@users.noreply.github.com>
Date: Fri, 15 Dec 2023 21:24:11 +0800
Subject: [PATCH 5/5] Delete roles/java directory

---
 roles/java/README.md          |  4 ----
 roles/java/tasks/cloudera.yml |  2 --
 roles/java/tasks/main.yml     | 10 ----------
 roles/java/tasks/openjdk7.yml |  3 ---
 roles/java/tasks/oracle8.yml  |  3 ---
 roles/java/vars/main.yml      |  4 ----
 6 files changed, 26 deletions(-)
 delete mode 100644 roles/java/README.md
 delete mode 100644 roles/java/tasks/cloudera.yml
 delete mode 100644 roles/java/tasks/main.yml
 delete mode 100644 roles/java/tasks/openjdk7.yml
 delete mode 100644 roles/java/tasks/oracle8.yml
 delete mode 100644 roles/java/vars/main.yml

diff --git a/roles/java/README.md b/roles/java/README.md
deleted file mode 100644
index b60b75c..0000000
--- a/roles/java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Java Role
----------
-
-This sets up either OpenJDK or Oracle Java while modifying update-alternatives appropriately (assuming that we are on ansible < 1.6 which has an update-alternatives module ). 
diff --git a/roles/java/tasks/cloudera.yml b/roles/java/tasks/cloudera.yml
deleted file mode 100644
index 691561c..0000000
--- a/roles/java/tasks/cloudera.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# file: roles/java/tasks/cloudera.yml
diff --git a/roles/java/tasks/main.yml b/roles/java/tasks/main.yml
deleted file mode 100644
index c737d5a..0000000
--- a/roles/java/tasks/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# file: roles/java/tasks/main.yml
-- include: 'cloudera.yml'
-  when: java_provider == "Cloudera"
-
-- include: 'openjdk7.yml'
-  when: java_provider == "OpenJDK7"
-
-- include: 'oracle8.yml'
-  when: java_provider == "Oracle8"
diff --git a/roles/java/tasks/openjdk7.yml b/roles/java/tasks/openjdk7.yml
deleted file mode 100644
index 4e41e10..0000000
--- a/roles/java/tasks/openjdk7.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# file: roles/java/tasks/openjdk7.yml
-
diff --git a/roles/java/tasks/oracle8.yml b/roles/java/tasks/oracle8.yml
deleted file mode 100644
index 7396e4e..0000000
--- a/roles/java/tasks/oracle8.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# file: roles/java/tasks/oracle8.yml
-
diff --git a/roles/java/vars/main.yml b/roles/java/vars/main.yml
deleted file mode 100644
index 083b885..0000000
--- a/roles/java/vars/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# file: roles/common/vars/main.yml
-
-java_provider: "Oracle8"