Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support and default to version 8u131 #64

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ User-configurable defaults:
java_version: 8

# which subversion?
java_subversion: 112
java_subversion: 131

# required for versions not built-in
#java_build:

# required for versions not built-in and newer than 8u131
#jdk_tarball_hash:

# which directory to put the download file?
java_download_path: /tmp
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#

java_version: 8
java_subversion: 112
java_subversion: 131

java_download_path: /tmp
java_download_from_oracle: true
Expand Down
2 changes: 1 addition & 1 deletion prefetch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@

vars:
- java_version: 8
- java_subversion: 112
- java_subversion: 131
- java_download_path: /tmp
- java_install_jce: true
13 changes: 12 additions & 1 deletion tasks/set-role-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
#
# version-specific variables
#
- name: set internal vars for 1.8.0_131
set_fact:
jdk_version_detail: "{{ java_version }}u{{ java_subversion }}-b11"
jdk_tarball_hash: d54c1d3a095b4ff2b6607d096fa80163
when: java_version == 8 and java_subversion == 131

- name: set internal vars for 1.8.0_112
set_fact:
jdk_version_detail: "{{ java_version }}u{{ java_subversion }}-b15"
Expand Down Expand Up @@ -130,8 +136,13 @@
- name: compose url for downloading file, if necessary
set_fact:
jdk_tarball_url: "http://download.oracle.com/otn-pub/java/jdk/{{ jdk_version_detail }}/{{ jdk_tarball_file }}"
when: jdk_version_detail is defined
when: jdk_version_detail is defined and jdk_tarball_hash is not defined


- name: compose url for downloading file, if necessary
set_fact:
jdk_tarball_url: "http://download.oracle.com/otn-pub/java/jdk/{{ jdk_version_detail }}/{{ jdk_tarball_hash }}/{{ jdk_tarball_file }}"
when: jdk_version_detail is defined and jdk_tarball_hash is defined

#
# JCE variables
Expand Down
2 changes: 1 addition & 1 deletion test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

vars:
#java_version: 8
java_subversion: 112
java_subversion: 131
java_install_jce: true