svn commit: r1851028 - in /ofbiz/branches/release16.11: build.gradle framework/catalina/ofbiz-component.xml specialpurpose/example/build.gradle

[Deepak Dixit-5]

Author: deepak
Date: Fri Jan 11 10:45:09 2019
New Revision: 1851028

URL: http://svn.apache.org/viewvc?rev=1851028&view=rev
Log:
Fixed: Upgraded tomcat8.0 to 8.5.x, as 8.0.x reached EOL.
(OFBIZ-10788)

Modified:
    ofbiz/branches/release16.11/build.gradle
    ofbiz/branches/release16.11/framework/catalina/ofbiz-component.xml
    ofbiz/branches/release16.11/specialpurpose/example/build.gradle

Modified: ofbiz/branches/release16.11/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/build.gradle?rev=1851028&r1=1851027&r2=1851028&view=diff
==============================================================================
--- ofbiz/branches/release16.11/build.gradle (original)
+++ ofbiz/branches/release16.11/build.gradle Fri Jan 11 10:45:09 2019
@@ -123,10 +123,10 @@ dependencies {
     compile 'org.apache.shiro:shiro-core:1.3.0'
     compile 'org.apache.tika:tika-core:1.12'
     compile 'org.apache.tika:tika-parsers:1.12'
-    compile 'org.apache.tomcat:tomcat-catalina-ha:8.0.42'
-    compile 'org.apache.tomcat:tomcat-catalina:8.0.42'
-    compile 'org.apache.tomcat:tomcat-jasper:8.0.42'
-    compile 'org.apache.tomcat:tomcat-tribes:8.0.42'
+    compile 'org.apache.tomcat:tomcat-catalina-ha:8.5.37'
+    compile 'org.apache.tomcat:tomcat-catalina:8.5.37'
+    compile 'org.apache.tomcat:tomcat-jasper:8.5.37'
+    compile 'org.apache.tomcat:tomcat-tribes:8.5.37'
     compile 'org.apache.xmlgraphics:fop:2.1'
     compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
     compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
@@ -169,7 +169,6 @@ dependencies {
     runtime 'org.apache.axis2:axis2-adb:1.7.1'
     runtime 'org.apache.httpcomponents:httpcore:4.4.1'
     runtime 'org.apache.servicemix.bundles:org.apache.servicemix.bundles.xpp3:1.1.4c_7'
-    runtime 'org.apache.tomcat.extras:tomcat-extras-juli-adapters:8.0.42'
     runtime 'org.apache.xalan:com.springsource.org.apache.xml.serializer:2.7.1'
     runtime 'ws-commons-java5:ws-commons-java5:1.0.1'
 

Modified: ofbiz/branches/release16.11/framework/catalina/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/catalina/ofbiz-component.xml?rev=1851028&r1=1851027&r2=1851028&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/catalina/ofbiz-component.xml (original)
+++ ofbiz/branches/release16.11/framework/catalina/ofbiz-component.xml Fri Jan 11 10:45:09 2019
@@ -66,7 +66,7 @@ under the License.
             <property name="enable-cross-subdomain-sessions" value="false"/>
         </property>
         <property name="ajp-connector" value="connector">
-            <!-- see http://tomcat.apache.org/tomcat-8.0-doc/config/ajp.html for reference -->
+            <!-- see http://tomcat.apache.org/tomcat-8.5-doc/config/ajp.html for reference -->
             <!--<property name="address" value=""/>-->
             <property name="port" value="8009"/>
             <property name="protocol" value="AJP/1.3"/>
@@ -95,7 +95,7 @@ under the License.
             -->
         </property>
         <property name="http-connector" value="connector">
-            <!-- see http://tomcat.apache.org/tomcat-8.0-doc/config/http.html for reference -->
+            <!-- see http://tomcat.apache.org/tomcat-8.5-doc/config/http.html for reference -->
             <!--<property name="address" value=""/>-->
             <property name="port" value="8080"/>
             <property name="protocol" value="HTTP/1.1"/>
@@ -124,7 +124,7 @@ under the License.
             -->
         </property>
         <property name="https-connector" value="connector">
-            <!-- see http://tomcat.apache.org/tomcat-8.0-doc/config/http.html for reference -->
+            <!-- see http://tomcat.apache.org/tomcat-8.5-doc/config/http.html for reference -->
             <!--<property name="address" value=""/>-->
             <property name="port" value="8443"/>
             <property name="protocol" value="HTTP/1.1"/>

Modified: ofbiz/branches/release16.11/specialpurpose/example/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/example/build.gradle?rev=1851028&r1=1851027&r2=1851028&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/example/build.gradle (original)
+++ ofbiz/branches/release16.11/specialpurpose/example/build.gradle Fri Jan 11 10:45:09 2019
@@ -1,3 +1,3 @@
 dependencies {
-    pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:8.0.39'
+    pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.37'
 }
\ No newline at end of file