From 95b7609b67447ac60c2e6b81b7002ccb20ba9969 Mon Sep 17 00:00:00 2001
From: Tero Pihlaja <tero.pihlaja@turckvilant.com>
Date: Tue, 17 Nov 2020 15:25:11 +0200
Subject: [PATCH] Payara 5.194 support

---
 CHANGELOG.md        | 3 +++
 metadata.rb         | 2 +-
 resources/domain.rb | 7 ++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcec5d44..404f00b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v.1.2.2:
+* Enhance : Better support for Payara 5.194+.
+
 ## v.1.2.1:
 * Enhance : Add support for newer JVM 8 and Payara.
 
diff --git a/metadata.rb b/metadata.rb
index 9882c066..53b8cb32 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,7 +3,7 @@
 maintainer_email 'peter@realityforge.org'
 license 'Apache-2.0'
 description 'Installs/Configures GlassFish Application Server'
-version '1.2.1'
+version '1.2.2'
 
 chef_version '>= 13.0'
 
diff --git a/resources/domain.rb b/resources/domain.rb
index 2d54f2ac..308c9273 100644
--- a/resources/domain.rb
+++ b/resources/domain.rb
@@ -162,7 +162,7 @@ def osgi_jvm_options
 end
 
 def security_jvm_options
-  [
+  opts = [
     '-Dcom.sun.enterprise.security.httpsOutboundKeyAlias=s1as',
     "-Djavax.net.ssl.keyStore=#{domain_dir_path}/config/keystore.jks",
     "-Djava.security.policy=#{domain_dir_path}/config/server.policy",
@@ -170,6 +170,11 @@ def security_jvm_options
     '-Dcom.sun.enterprise.security.httpsOutboundKeyAlias=s1as',
     "-Djava.security.auth.login.config=#{domain_dir_path}/config/login.conf",
   ]
+
+  if node['glassfish']['variant'] == 'payara' && node['glassfish']['version'].split('.')[0].to_i >= 5 && node['glassfish']['version'].split('.')[1].to_i >= 194
+    opts << '[Azul-1.8.0u222|1.8.0u260]-XX:+UseOpenJSSE'
+  end
+  opts
 end
 
 def grizzly_options