From 61ef0983e4feb3f604bf5009e51b290b08e65621 Mon Sep 17 00:00:00 2001
From: anajosep <anand.francis.joseph.augustin@oracle.com>
Date: Tue, 15 Jan 2019 10:35:48 -0800
Subject: [PATCH] Changes for handling newer version of Derby/JavaDB integrated
 in GlassFish

Signed-off-by: anajosep <anand.francis.joseph.augustin@oracle.com>
---
 bin/xml/impl/glassfish/common.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/xml/impl/glassfish/common.xml b/bin/xml/impl/glassfish/common.xml
index ae9cde255e..94425636d2 100644
--- a/bin/xml/impl/glassfish/common.xml
+++ b/bin/xml/impl/glassfish/common.xml
@@ -936,6 +936,8 @@
             <java classname="org.apache.derby.drda.NetworkServerControl"
                   classpath="${use.derby.classpath}" fork="true" spawn="true">
               <sysproperty key="derby.system.home" value="${use.derby.system.home}"/>
+              <sysproperty key="java.security.manager" value=""/>
+              <sysproperty key="java.security.policy" value="${server.config.dir.path}/server.policy"/>
               <arg line="-h ${use.derby.server} -p ${use.derby.port} start"/>
             </java>
             <sleep seconds="${use.derby.startup.delay}"/>