[ofbiz-framework] branch trunk updated: Improved: Update build.gradle to the latest dependencies

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ef097c7  Improved: Update build.gradle to the latest dependencies
ef097c7 is described below

commit ef097c7a9a4165a19c0cc4321f5044e759258b1c
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Apr 21 15:49:00 2020 +0200

    Improved: Update build.gradle to the latest dependencies
    
    (OFBIZ-11603)
    
    Replaces deprecated calls
---
 .../java/org/apache/ofbiz/catalina/container/CatalinaContainer.java    | 3 +--
 .../apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
 
b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
index 1861608..8a0efc1 100644
--- 
a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
+++ 
b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
@@ -50,7 +50,6 @@ import org.apache.catalina.filters.RequestDumperFilter;
 import org.apache.catalina.ha.ClusterManager;
 import org.apache.catalina.ha.tcp.ReplicationValve;
 import org.apache.catalina.ha.tcp.SimpleTcpCluster;
-import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.ContextConfig;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.tribes.group.GroupChannel;
@@ -520,7 +519,7 @@ public class CatalinaContainer implements Container {
         context.addLifecycleListener(new ContextConfig());
         context.setJ2EEApplication("OFBiz");
         context.setJ2EEServer("OFBiz Container");
-        context.setLoader(new 
WebappLoader(Thread.currentThread().getContextClassLoader()));
+        
context.setParentClassLoader(Thread.currentThread().getContextClassLoader());
         context.setDocBase(location);
         context.setReloadable(ContainerConfig.getPropertyValue(configuration, 
"apps-context-reloadable", false));
         context.setDistributable(contextIsDistributable);
diff --git 
a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
 
b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
index d3da739..1ca6d82 100644
--- 
a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
+++ 
b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
@@ -115,7 +115,7 @@ public class CrossSubdomainSessionValve extends ValveBase {
                 if (mimeHeaders.getName(i).equals("Set-Cookie")) {
                     MessageBytes value = mimeHeaders.getValue(i);
                     if (value.indexOf(cookie.getName()) >= 0) {
-                        String newCookieValue = 
request.getContext().getCookieProcessor().generateHeader(newCookie);
+                        String newCookieValue = 
request.getContext().getCookieProcessor().generateHeader(newCookie, request);
                         if (Debug.verboseOn()) 
Debug.logVerbose("CrossSubdomainSessionValve: old Set-Cookie value: " + 
value.toString(), MODULE);
                         if (Debug.verboseOn()) 
Debug.logVerbose("CrossSubdomainSessionValve: new Set-Cookie value: " + 
newCookieValue, MODULE);
                         value.setString(newCookieValue);