svn commit: r1831074 - in /ofbiz/ofbiz-framework/trunk: build.gradle framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java

[jacopoc]

Author: jacopoc
Date: Mon May  7 06:41:47 2018
New Revision: 1831074

URL: http://svn.apache.org/viewvc?rev=1831074&view=rev
Log:
Implemented: Upgraded to latest Tomcat (9.0.7).
(OFBIZ-10036)

Modified:
    ofbiz/ofbiz-framework/trunk/build.gradle
    ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java

Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1831074&r1=1831073&r2=1831074&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Mon May  7 06:41:47 2018
@@ -135,10 +135,10 @@ dependencies {
     compile 'org.apache.shiro:shiro-core:1.4.0'
     compile 'org.apache.tika:tika-core:1.16'
     compile 'org.apache.tika:tika-parsers:1.16'
-    compile 'org.apache.tomcat:tomcat-catalina-ha:8.5.24'
-    compile 'org.apache.tomcat:tomcat-catalina:8.5.24'
-    compile 'org.apache.tomcat:tomcat-jasper:8.5.24'
-    compile 'org.apache.tomcat:tomcat-tribes:8.5.24'
+    compile 'org.apache.tomcat:tomcat-catalina-ha:9.0.7'
+    compile 'org.apache.tomcat:tomcat-catalina:9.0.7'
+    compile 'org.apache.tomcat:tomcat-jasper:9.0.7'
+    compile 'org.apache.tomcat:tomcat-tribes:9.0.7'
     compile 'org.apache.xmlgraphics:fop:2.2'
     compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
     compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3'

Modified: ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java?rev=1831074&r1=1831073&r2=1831074&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java Mon May  7 06:41:47 2018
@@ -36,11 +36,6 @@ public class OFBizRealm extends RealmBas
     public static final String module = OFBizRealm.class.getName();
 
     @Override
-    protected String getName() {
-        return "OFBizRealm";
-    }
-
-    @Override
     protected String getPassword(String username) {
         Delegator delegator = DelegatorFactory.getDelegator(null);
         try {