Skip to content

Commit 2d7f797

Browse files
authored
rename java.home to java_home to not be in the same var tree as java.version (#312)
1 parent c8a8c19 commit 2d7f797

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

defaults/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,7 @@ grafana:
308308

309309
java:
310310
version: 17
311-
# this breaks templating.
312-
#home: /usr/lib/jvm/java-{{ java.version}}
311+
java_home: /usr/lib/jvm/java-{{ java.version }}
313312

314313
localstack:
315314
enabled: false

tasks/dataverse-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
create: yes
2828

2929
- name: build warfile without tests and default maven. tail /tmp/dataverse/mvn.out for gory details.
30-
shell: "export JAVA_HOME={{ java.home }} && mvn -T 2C clean package -Dmaven.test.skip=true > mvn.out"
30+
shell: "export JAVA_HOME={{ java_home }} && mvn -T 2C clean package -Dmaven.test.skip=true > mvn.out"
3131
args:
3232
chdir: "{{ dataverse.srcdir }}"
3333
when: dataverse.unittests.enabled == false and

0 commit comments

Comments
 (0)