Merge pull request #94 from icatproject-contrib/payara-6.2023.9

Upgrade default Payara version to 6.2023.9
icatproject-contrib · Sep 15, 2023 · 2e16209 · 2e16209
2 parents c8a8933 + 0f9f14c
commit 2e16209
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/roles/payara/defaults/main.yml b/roles/payara/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 
-payara_version: '6.2023.8'
+payara_version: '6.2023.9'
 payara_dir: '/home/{{ payara_user }}/payara{{ payara_version }}'
 payara_domain: 'domain1'
 payara_domain_dir: '{{ payara_dir }}/glassfish/domains/{{ payara_domain }}'

diff --git a/roles/payara/tasks/main.yml b/roles/payara/tasks/main.yml
@@ -135,12 +135,6 @@
     line: 'AS_JAVA="{{ java_dir }}"'
     regexp: '^AS_JAVA='
 
-- name: 'Temporary fix for Java 17'
-  lineinfile:
-    path: '{{ payara_dir }}/glassfish/config/asenv.conf'
-    line: 'export JAVA_TOOL_OPTIONS="--add-opens=java.base/java.io=ALL-UNNAMED"'
-    regexp: 'JAVA_TOOL_OPTIONS='
-
 - name: 'Setup payara if not setup'
   import_tasks: tasks/installation.yml
   when: (ansible_local is not defined) or (ansible_local.local is not defined) or (ansible_local.local.instantiations is not defined) or (ansible_local.local.instantiations.payara is not defined) or (ansible_local.local.instantiations.payara != 'true') or (ansible_local.local.versions.payara != payara_version)