Skip to content

Commit

Permalink
Support 8u201 and 11.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
srsp committed Jan 20, 2019
1 parent 6c9414b commit 31e85f9
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ None, but it is strongly advised to set `java_version`. You must set the `java_s

vars:
- java_version: 11
- java_subversion: 0.1
- java_subversion: 0.2
```
### JDK 9 / 10
Expand Down Expand Up @@ -80,7 +80,7 @@ User-configurable defaults:
java_version: 8
# Java Subversion
java_subversion: 191
java_subversion: 201
# Whether to download Java from from Oracle directly
# - oracle: Download from Oracle website on-the-fly.
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# User-configurable defaults

java_version: 8
java_subversion: 191
java_subversion: 201
java_download_path: /tmp

# Possible values: 'oracle', 'mirror' or 'local'
Expand Down
22 changes: 18 additions & 4 deletions tasks/set-role-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,19 @@
## Version-specific variables
# JDK 11

- name: Set internal variables for 11
- name: Set internal variables for 11.0.2
set_fact:
jdk_version_detail: "{{ java_version }}.{{ java_subversion }}+9"
jdk_tarball_hash: f51449fcd52f4d52b93a989c5c56ed3c
when: java_version == 11

# All 11 versions following the current only available for download with oracle account (not supported by this role)!

- name: Set internal variables for 11.0.1
set_fact:
jdk_version_detail: "{{ java_version }}.{{ java_subversion }}+13"
jdk_tarball_hash: 90cf5d8f270a4347a95050320eef3fb7
when: java_version == 11
when: java_version == 11 and java_subversion == 0.1

# JDK 10

Expand All @@ -121,14 +129,20 @@

## JDK 8

- name: set internal variables for 1.8.0_201
set_fact:
jdk_version_detail: "{{ java_version }}u{{ java_subversion }}-b09"
jdk_tarball_hash: 42970487e3af4f5aa5bca3f542482c60
when: java_version == 8 and java_subversion == 201

# All versions below are only available for download with an oracle account (not supported by this role)!

- name: set internal variables for 1.8.0_191
set_fact:
jdk_version_detail: "{{ java_version }}u{{ java_subversion }}-b12"
jdk_tarball_hash: 2787e4a523244c269598db4e85c51e0c
when: java_version == 8 and java_subversion == 191

# All versions below are only available for download with an oracle account (not supported by this role)!

- name: set internal variables for 1.8.0_181
set_fact:
jdk_version_detail: "{{ java_version }}u{{ java_subversion }}-b13"
Expand Down
2 changes: 1 addition & 1 deletion test_11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Variables from defaults/main.yml
vars:
- java_version: 11
- java_subversion: 0.1
- java_subversion: 0.2
- java_download_path: "{{ oracle_java.path }}"
- java_download_from: oracle
- java_mirror: "http://download.oracle.com/otn-pub/java/jdk"
Expand Down
2 changes: 1 addition & 1 deletion test_8_local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

vars:
- java_version: 8
- java_subversion: 181
- java_subversion: 201
- java_download_path: /tmp

# Possible values: 'oracle', 'mirror' or 'local'
Expand Down

0 comments on commit 31e85f9

Please sign in to comment.