Skip to content

Commit 65a4d01

Browse files
authored
Merge pull request #118 from ansiblebit/develop
support for JDK12
2 parents 44d58ed + 97a6b46 commit 65a4d01

File tree

5 files changed

+36
-21
lines changed

5 files changed

+36
-21
lines changed

README.md

+25-10
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
4747
- **oracle_java_set_as_default**: flag to indicate if this play should set Java as default (default: `yes`).
4848
- **oracle_java_use_defaults**: flag to indicate you want to use defaults set in the `defaults` directory (default: `yes`).
4949
**WARNING**. setting this to `no` will require the user to pass all of the distribution variables.
50-
See `* | Java 8` examples in the _Playbooks_ section.
50+
See `* | Java 11` examples in the _Playbooks_ section.
5151

5252
### Debian
5353

5454
**WARNING** to override **any** of the following variables (even if it's only one),
5555
you'll need to set `oracle_java_use_defaults: no` and override **all** of their values since
5656
OS family defaults will no longer be loaded.
57-
See `debian | Java 8` example in the _Playbooks_ section.
57+
See `debian | Java 11` example in the _Playbooks_ section.
5858

5959
- **oracle_java_apt_repository**: Personal Package Archive (PPA) from where to install Java.
6060
- **oracle_java_apt_repository_key**: PPA repository key.
@@ -69,7 +69,7 @@ See `debian | Java 8` example in the _Playbooks_ section.
6969
**WARNING** to override **any** of the following variables (even if it's only one),
7070
you'll need to set `oracle_java_use_defaults: no` and override **all** of their values since
7171
OS family defaults will no longer be loaded.
72-
See `debian | ubuntu | Java 8` example in the _Playbooks_ section.
72+
See `debian | ubuntu | Java 11` example in the _Playbooks_ section.
7373

7474
- **oracle_java_apt_repository**: Personal Package Archive (PPA) from where to install Java.
7575
- **oracle_java_cache_valid_time**: the amount of time in seconds the apt cache is valid.
@@ -84,7 +84,7 @@ See `debian | ubuntu | Java 8` example in the _Playbooks_ section.
8484
**WARNING** to override **any** of the following variables (even if it's only one),
8585
you'll need to set `oracle_java_use_defaults: no` and override **all** of their values since
8686
OS family defaults will no longer be loaded.
87-
See `redhat | centos 7 | Java Other` example in the _Playbooks_ section.
87+
See `redhat | centos 7 | Java 11` example in the _Playbooks_ section.
8888

8989
- **oracle_java_dir_source**: directory where to store the RPM files.
9090
- **oracle_java_download_timeout**: download timeout, in seconds.
@@ -102,40 +102,56 @@ See `redhat | centos 7 | Java Other` example in the _Playbooks_ section.
102102
roles:
103103
- role: ansiblebit.oracle-java
104104

105+
# debian | Java 12
106+
- hosts: servers
107+
roles:
108+
- role: ansiblebit.oracle-java
109+
105110
# debian | Java 11
106111
- hosts: servers
107112
roles:
108113
- role: ansiblebit.oracle-java
114+
oracle_java_deb_package: 'oracle-java11-installer'
115+
oracle_java_debconf_package_default: 'oracle-java11-set-default'
116+
oracle_java_home: "/usr/lib/jvm/java-11-oracle"
109117

110118
## explicitely passing default parameters
111119
- hosts: servers
112120
roles:
113121
- role: ansiblebit.oracle-java
114122

123+
# debian | ubuntu | Java 12
124+
- hosts: servers
125+
roles:
126+
- role: ansiblebit.oracle-java
127+
115128
# debian | ubuntu | Java 11
116129
- hosts: servers
117130
roles:
118131
- role: ansiblebit.oracle-java
132+
oracle_java_deb_package: 'oracle-java11-installer'
133+
oracle_java_debconf_package_default: 'oracle-java11-set-default'
134+
oracle_java_home: "/usr/lib/jvm/java-11-oracle"
119135

120-
# redhat | centos 7 | Java 11
136+
# redhat | centos 7 | Java 12
121137
- hosts: servers
122138
roles:
123139
- role: ansiblebit.oracle-java
124140

125-
# redhat | centos 7 | Java Other
141+
# redhat | centos 7 | Java 11
126142
- hosts: servers
127143
roles:
128144
- role: ansiblebit.oracle-java
129145
oracle_java_use_defaults: no
130146
oracle_java_dir_source: '/usr/local/src'
131147
oracle_java_download_timeout: 60
132-
oracle_java_rpm_filename: 'jdk-8u201-linux-x64.rpm'
148+
oracle_java_rpm_filename: 'jdk-11.0.3_linux-x64_bin.rpm'
133149
oracle_java_home: '/usr/java/default'
134150
oracle_java_os_supported: yes
135-
oracle_java_rpm_url: 'https://download.oracle.com/path/to/file.rpm'
151+
oracle_java_rpm_url: 'https://download.oracle.com/otn/java/jdk/11.0.3+12/37f5e150db5247ab9333b11c1dddcd30/jdk-11.0.3_linux-x64_bin.rpm'
136152
oracle_java_rpm_validate_certs: yes
137153
oracle_java_set_as_default: no
138-
oracle_java_version_string: 1.8.0_201
154+
oracle_java_version_string: 11.0.3
139155
```
140156
141157
Use `--skip-tags=debug` if you want to suppress debug information.
@@ -175,5 +191,4 @@ vagrant destroy bionic64.vagrant.dev
175191

176192
## Links
177193

178-
- [launchpad > WebUpd8 > Oracle Java (JDK) 8 / 9 Installer PPA](https://launchpad.net/~webupd8team/+archive/ubuntu/java)
179194
- [launchpad > Linux Uprising > Oracle Java](https://launchpad.net/~linuxuprising/+archive/ubuntu/java)

defaults/debian-ubuntu.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
oracle_java_apt_repository: 'ppa:linuxuprising/java'
88
oracle_java_cache_valid_time: 3600
9-
oracle_java_deb_package: 'oracle-java11-installer'
10-
oracle_java_debconf_package_default: 'oracle-java11-set-default'
11-
oracle_java_home: "/usr/lib/jvm/java-11-oracle"
9+
oracle_java_deb_package: 'oracle-java12-installer'
10+
oracle_java_debconf_package_default: 'oracle-java12-set-default'
11+
oracle_java_home: "/usr/lib/jvm/java-12-oracle"
1212
oracle_java_license_version: 'shared/accepted-oracle-license-v1-2'
1313
oracle_java_state: latest

defaults/debian.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
oracle_java_apt_repository: 'deb http://ppa.launchpad.net/linuxuprising/java/ubuntu bionic main'
88
oracle_java_apt_repository_key: 'EA8CACC073C3DB2A'
99
oracle_java_cache_valid_time: 3600
10-
oracle_java_deb_package: 'oracle-java11-installer'
11-
oracle_java_debconf_package_default: 'oracle-java11-set-default'
12-
oracle_java_home: "/usr/lib/jvm/java-11-oracle"
10+
oracle_java_deb_package: 'oracle-java12-installer'
11+
oracle_java_debconf_package_default: 'oracle-java12-set-default'
12+
oracle_java_home: "/usr/lib/jvm/java-12-oracle"
1313
oracle_java_license_version: 'shared/accepted-oracle-license-v1-2'
1414
oracle_java_state: latest

defaults/redhat.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
oracle_java_dir_source: '/usr/local/src'
88
oracle_java_download_timeout: 60
9-
oracle_java_rpm_filename: 'jdk-11.0.2_linux-x64_bin.rpm'
9+
oracle_java_rpm_filename: 'jdk-12.0.1_linux-x64_bin.rpm'
1010
oracle_java_home: '/usr/java/default'
11-
oracle_java_rpm_url: 'http://download.oracle.com/otn-pub/java/jdk/11.0.2+9/f51449fcd52f4d52b93a989c5c56ed3c/jdk-11.0.2_linux-x64_bin.rpm'
11+
oracle_java_rpm_url: 'https://download.oracle.com/otn-pub/java/jdk/12.0.1+12/69cfe15208a647278a19ef0990eea691/jdk-12.0.1_linux-x64_bin.rpm'
1212
oracle_java_rpm_validate_certs: yes
13-
oracle_java_version: 11
14-
oracle_java_version_string: 11.0.2
13+
oracle_java_version: 12
14+
oracle_java_version_string: 12.0.1

tests/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
gather_facts: yes
2727
vars:
2828
debug: yes
29-
test_expected_java_version: '11.0.2'
29+
test_expected_java_version: '12.0.1'
3030

3131
roles:
3232
- role: oracle-java

0 commit comments

Comments
 (0)