svn commit: r1666960 - in /ofbiz/branches/release14.12: ./ framework/base/lib/commons/ framework/entity/lib/

[jacopoc]

Author: jacopoc
Date: Mon Mar 16 11:13:18 2015
New Revision: 1666960

URL: http://svn.apache.org/r1666960
Log:
Applied fix from trunk for revision: 1666958
===

OFBIZ-6156: Upgraded commons-pool2 from 2.2 to.2.3 and commons-dbcp2 from 2.0.1 to 2.1


Added:
    ofbiz/branches/release14.12/framework/base/lib/commons/commons-pool2-2.3.jar
      - copied unchanged from r1666958, ofbiz/trunk/framework/base/lib/commons/commons-pool2-2.3.jar
    ofbiz/branches/release14.12/framework/entity/lib/commons-dbcp2-2.1.jar
      - copied unchanged from r1666958, ofbiz/trunk/framework/entity/lib/commons-dbcp2-2.1.jar
Removed:
    ofbiz/branches/release14.12/framework/base/lib/commons/commons-pool2-2.2.jar
    ofbiz/branches/release14.12/framework/entity/lib/commons-dbcp2-2.0.1.jar
Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/.classpath
    ofbiz/branches/release14.12/LICENSE

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 16 11:13:18 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958

Modified: ofbiz/branches/release14.12/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/.classpath?rev=1666960&r1=1666959&r2=1666960&view=diff
==============================================================================
--- ofbiz/branches/release14.12/.classpath (original)
+++ ofbiz/branches/release14.12/.classpath Mon Mar 16 11:13:18 2015
@@ -67,7 +67,7 @@
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.6.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-net-3.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/commons/commons-pool2-2.2.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/commons/commons-pool2-2.3.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-validator-1.4.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/commons/commons-csv-1.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/>
@@ -100,7 +100,7 @@
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.57-tomcat-util.jar"/>
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli.jar"/>
     <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli-adapters.jar"/>
-    <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp2-2.0.1.jar"/>
+    <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp2-2.1.jar"/>
     <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/>
     <classpathentry kind="lib" path="specialpurpose/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
     <classpathentry kind="lib" path="specialpurpose/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/>

Modified: ofbiz/branches/release14.12/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/LICENSE?rev=1666960&r1=1666959&r2=1666960&view=diff
==============================================================================
--- ofbiz/branches/release14.12/LICENSE (original)
+++ ofbiz/branches/release14.12/LICENSE Mon Mar 16 11:13:18 2015
@@ -55,7 +55,7 @@ framework/base/lib/commons/commons-io-2.
 framework/base/lib/commons/commons-lang-2.6.jar
 framework/base/lib/commons/commons-logging-1.1.2.jar
 framework/base/lib/commons/commons-net-3.1.jar
-framework/base/lib/commons/commons-pool2-2.2.jar
+framework/base/lib/commons/commons-pool2-2.3.jar
 framework/base/lib/commons/commons-validator-1.4.0.jar
 framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar
 framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
@@ -84,7 +84,7 @@ framework/catalina/lib/tomcat-7.0.57-tom
 framework/catalina/lib/tomcat-7.0.57-tomcat-util.jar
 framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli.jar
 framework/catalina/lib/tomcat-extras-7.0.57-tomcat-juli-adapters.jar
-framework/entity/lib/commons-dbcp2-2.0.1.jar
+framework/entity/lib/commons-dbcp2-2.1.jar
 framework/entity/lib/jdbc/derby-10.11.1.1.jar
 framework/service/lib/axiom-api-1.2.9.jar
 framework/service/lib/axiom-impl-1.2.9.jar