From 7dcb6697bfa157e8cf6681471f7830c3d1fd0b37 Mon Sep 17 00:00:00 2001 From: Andrzej Godziuk Date: Tue, 2 May 2017 12:26:09 +0200 Subject: [PATCH 1/4] Update java to u131 --- tasks/set-role-variables.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tasks/set-role-variables.yml b/tasks/set-role-variables.yml index 9105e02..c72fa52 100644 --- a/tasks/set-role-variables.yml +++ b/tasks/set-role-variables.yml @@ -31,6 +31,11 @@ # # version-specific variables # +- name: set internal vars for 1.8.0_131 + set_fact: + jdk_version_detail: "{{ java_version }}u{{ java_subversion }}-b11" + 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" From ae3484ff027ac871d9dfad286046ccb6911bec09 Mon Sep 17 00:00:00 2001 From: Andrzej Godziuk Date: Tue, 2 May 2017 12:35:58 +0200 Subject: [PATCH 2/4] Support for hashed URLs --- tasks/set-role-variables.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tasks/set-role-variables.yml b/tasks/set-role-variables.yml index c72fa52..0e3a1d5 100644 --- a/tasks/set-role-variables.yml +++ b/tasks/set-role-variables.yml @@ -34,6 +34,7 @@ - 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 @@ -135,9 +136,14 @@ - 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 # From 0463628b1079c5c41930fe8b1ee26a7f617a0f76 Mon Sep 17 00:00:00 2001 From: Andrzej Godziuk Date: Fri, 26 May 2017 12:21:24 +0200 Subject: [PATCH 3/4] Make 8u131 the default --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e49bc549c3c26e7906ae56cce7e98568d12f81f1 Mon Sep 17 00:00:00 2001 From: Trevor Robinson Date: Thu, 15 Jun 2017 19:20:00 -0500 Subject: [PATCH 4/4] Update subversion to 8u131 in README, prefetch, and test Also document overrides for newer versions in README --- README.md | 8 +++++++- prefetch.yml | 2 +- test.yml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) 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/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/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