svn commit: r1837860 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ build.gradle

Author: jleroux
Date: Sat Aug 11 10:40:18 2018
New Revision: 1837860

URL: http://svn.apache.org/viewvc?rev=1837860&view=rev
Log:
"Applied fix from trunk for revision: 1837857"
------------------------------------------------------------------------
r1837857 | jleroux | 2018-08-11 12:37:40 +0200 (sam. 11 août 2018) | 10 lignes

Fixed: Update Apache Tomcat to 9.0.10 because of CVE-2018-8037
(OFBIZ-10517)

If an async request was completed by the application at the same time as the
container triggered the async timeout, a race condition existed that could
result in a user seeing a response intended for a different user.
An additional issue was present in the NIO and NIO2 connectors that did not
correctly track the closure of the connection when an async request was
completed by the application and timed out by the container at the same time.
This could also result in a user seeing a response intended for another user.
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/build.gradle

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 11 10:40:18 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857

Modified: ofbiz/ofbiz-framework/branches/release17.12/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/build.gradle?rev=1837860&r1=1837859&r2=1837860&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/build.gradle (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/build.gradle Sat Aug 11 10:40:18 2018
@@ -129,10 +129,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: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.tomcat:tomcat-catalina-ha:9.0.10'
+    compile 'org.apache.tomcat:tomcat-catalina:9.0.10'
+    compile 'org.apache.tomcat:tomcat-jasper:9.0.10'
+    compile 'org.apache.tomcat:tomcat-tribes:9.0.10'
     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'
@@ -145,6 +145,7 @@ dependencies {
     compile 'oro:oro:2.0.8'
     compile 'wsdl4j:wsdl4j:1.6.3'
     compile 'org.jsoup:jsoup:1.11.2'
+    compile 'io.jsonwebtoken:jjwt:0.9.0'
 
     // ofbiz unit-test compile libs
     testCompile 'org.mockito:mockito-core:2.+'