Skip to content

Commit 013b799

Browse files
committed
removed oracle_java_version variable.
1 parent 6f4d635 commit 013b799

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
7474
- **oracle_java_home**: the location of the Java home directory (default: `/usr/java/default`).
7575
- **oracle_java_rpm_filename**: file name used for the download destination (default: `jdk-10.0.2_linux-x64_bin.rpm`).
7676
- **oracle_java_rpm_validate_certs**: flag to indicate if you want SSL certificate validation (default: `yes`).
77-
- **oracle_java_version**: the Oracle JDK version to be installed (default: `10`).
78-
- **oracle_java_version_string**: the Java version string to verify installation against (default: `1.{{ oracle_java_version }}.0_u{{ oracle_java_version_update }}`).
77+
- **oracle_java_version_string**: the Java version string to verify installation against (default: `1.10.2`).
7978

8079
## Playbooks
8180

defaults/redhat.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ oracle_java_home: '/usr/java/default'
1111
oracle_java_os_supported: yes
1212
oracle_java_rpm_url: 'http://download.oracle.com/otn-pub/java/jdk/10.0.2+13/19aef61b38124481863b1413dce1855f/jdk-10.0.2_linux-x64_bin.rpm'
1313
oracle_java_rpm_validate_certs: yes
14-
oracle_java_version: 10
1514
oracle_java_version_string: 10.0.2

tasks/debug.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
- oracle_java_apt_repository_key
1717
- oracle_java_set_as_default
1818
- oracle_java_state
19-
- oracle_java_version
2019
- oracle_java_version_installed
2120
- oracle_java_version_string

tests/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
roles:
3232
- role: oracle-java
33-
oracle_java_version: "{{ test_redhat_java_version }}"
3433
oracle_java_set_as_default: yes
3534
oracle_java_rpm_validate_certs: no
3635
when: ansible_os_family | lower == 'redhat'
@@ -41,9 +40,10 @@
4140
when: ansible_os_family | lower == 'redhat'
4241

4342
- role: oracle-java
44-
oracle_java_version: "{{ test_debian_java_version }}"
4543
oracle_java_set_as_default: yes
4644
oracle_java_rpm_validate_certs: no
45+
oracle_java_apt_repository: 'deb http://ppa.launchpad.net/webupd8team/java/ubuntu bionic main'
46+
oracle_java_apt_repository_key: 'C2518248EEA14886'
4747
when: ansible_os_family | lower == 'debian'
4848

4949
- role: tests

0 commit comments

Comments
 (0)