diff --git a/README.md b/README.md index 3556250..7bc0436 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/defaults/main.yml b/defaults/main.yml index c0da713..f599f4d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,7 +11,7 @@ # java_version: 8 -java_subversion: 112 +java_subversion: 131 java_download_path: /tmp java_download_from_oracle: true diff --git a/prefetch.yml b/prefetch.yml index 676633f..7297373 100644 --- a/prefetch.yml +++ b/prefetch.yml @@ -13,6 +13,6 @@ vars: - java_version: 8 - - java_subversion: 112 + - java_subversion: 131 - java_download_path: /tmp - java_install_jce: true diff --git a/tasks/set-role-variables.yml b/tasks/set-role-variables.yml index 9105e02..0e3a1d5 100644 --- a/tasks/set-role-variables.yml +++ b/tasks/set-role-variables.yml @@ -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" @@ -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 diff --git a/test.yml b/test.yml index e512797..f3bcc03 100644 --- a/test.yml +++ b/test.yml @@ -9,5 +9,5 @@ vars: #java_version: 8 - java_subversion: 112 + java_subversion: 131 java_install_jce: true