Skip to content

Commit

Permalink
Merge pull request #24 from RommelLayco/bugfix/java_download_from_con…
Browse files Browse the repository at this point in the history
…ditional

Stringfy the oracle and mirror value inside conditional
  • Loading branch information
srsp authored Mar 20, 2019
2 parents 605ec53 + bb45d34 commit 34984f6
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions tasks/set-jdk-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,19 @@
set_fact:
jce_zip_url: "http://download.oracle.com/otn-pub/java/jce/{{ java_version }}/{{ jce_zip_file }}"
jce_zip_folder: "UnlimitedJCEPolicyJDK{{ java_version }}"
when: java_version == 8 and java_subversion < 161 and java_download_from == oracle
when:
- java_version == 8
- java_subversion < 161
- java_download_from == "oracle"

- name: Set JCE variables for Java 8 for alternative mirror
set_fact:
jce_zip_url: "{{ java_mirror }}/{{ jce_zip_file }}"
jce_zip_folder: "UnlimitedJCEPolicyJDK{{ java_version }}"
when: java_version == 8 and java_subversion < 161 and java_download_from == mirror
when:
- java_version == 8
- java_subversion < 161
- java_download_from == "mirror"

# JDKs greater or equal than 8u161 do not need JCE anymore

Expand Down

0 comments on commit 34984f6

Please sign in to comment.