Skip to content

Commit ac40ec4

Browse files
Merge pull request #848 from AtlasOfLivingAustralia/feature/java17
Add java 17
2 parents 3727556 + 081e454 commit ac40ec4

File tree

4 files changed

+39
-1
lines changed

4 files changed

+39
-1
lines changed

Diff for: ansible/roles/common/defaults/main.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ packaging: "war"
22
use_zulu8: False
33
use_openjdk8: True
44
use_openjdk11: False
5+
use_openjdk17: False

Diff for: ansible/roles/common/tasks/setfacts.yml

+16
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,22 @@
212212
tags:
213213
- setfacts
214214

215+
- name: set java defaults for openjdk17 (amd64)
216+
set_fact:
217+
java_security_opts: -Dlog4j2.formatMsgNoLookups=true
218+
java_home: /usr/lib/jvm/java-17-openjdk-amd64
219+
when: use_openjdk17 is defined and use_openjdk17 | bool == True and ansible_architecture != "aarch64"
220+
tags:
221+
- setfacts
222+
223+
- name: set java defaults for openjdk17 (arm64)
224+
set_fact:
225+
java_security_opts: -Dlog4j2.formatMsgNoLookups=true
226+
java_home: /usr/lib/jvm/java-17-openjdk-arm64
227+
when: use_openjdk17 is defined and use_openjdk17 | bool == True and ansible_architecture == "aarch64"
228+
tags:
229+
- setfacts
230+
215231
- name: set java defaults for openjdk11 (amd64)
216232
set_fact:
217233
java_security_opts: -Dlog4j2.formatMsgNoLookups=true

Diff for: ansible/roles/java/tasks/main.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
- name: "Show java version"
55
debug:
6-
msg: "Using java versions: java8={{ use_openjdk8 }} java11={{ use_openjdk11 }}'"
6+
msg: "Using java versions: java8={{ use_openjdk8 }} java11={{ use_openjdk11 }} java17={{ use_openjdk17 }}'"
77
tags:
88
- java
99

@@ -15,3 +15,6 @@
1515

1616
- include_tasks: openjdk-java-11.yml
1717
when: use_openjdk11 is defined and use_openjdk11 | bool == True
18+
19+
- include_tasks: openjdk-java-17.yml
20+
when: use_openjdk17 is defined and use_openjdk17 | bool == True

Diff for: ansible/roles/java/tasks/openjdk-java-17.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
- include_tasks: ../../common/tasks/setfacts.yml
2+
tags:
3+
- java
4+
5+
- set_fact:
6+
java_package: "{{ 'openjdk-17-' + java_package_suffix[java_headless | bool][java_jre | bool] }}"
7+
tags:
8+
- java
9+
10+
- name: install openjdk 17 java (Debian)
11+
apt:
12+
pkg:
13+
- ca-certificates
14+
- "{{ java_package }}"
15+
state: latest
16+
when: ansible_os_family == "Debian"
17+
tags:
18+
- java

0 commit comments

Comments
 (0)