Author: jacopoc
Date: Mon May 4 13:46:58 2015
New Revision: 1677599
URL: http://svn.apache.org/r1677599
Log:
Applied fix from trunk for revision: 1677597
===
Removed commons-cli jar that was not used: barcode4j has an optional dependency
on it but only if used from the command line (which is not the case in OFBiz);
Groovy has a dependency on Commons CLI but it uses a copy of it bundled in
groovy-all jar.
Removed:
ofbiz/branches/release14.12/framework/base/lib/commons/commons-cli-1.2.jar
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/.classpath
ofbiz/branches/release14.12/LICENSE
ofbiz/branches/release14.12/macros.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 4 13:46:58 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,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123
+/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,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597
Modified: ofbiz/branches/release14.12/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/.classpath?rev=1677599&r1=1677598&r2=1677599&view=diff
==============================================================================
--- ofbiz/branches/release14.12/.classpath (original)
+++ ofbiz/branches/release14.12/.classpath Mon May 4 13:46:58 2015
@@ -57,7 +57,6 @@
<classpathentry kind="lib" path="framework/base/lib/xstream-1.4.6.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-beanutils-core-1.8.3.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/commons/commons-cli-1.2.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-codec-1.10.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-collections-3.2.1.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-compress-1.4.1.jar"/>
Modified: ofbiz/branches/release14.12/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/LICENSE?rev=1677599&r1=1677598&r2=1677599&view=diff
==============================================================================
--- ofbiz/branches/release14.12/LICENSE (original)
+++ ofbiz/branches/release14.12/LICENSE Mon May 4 13:46:58 2015
@@ -44,7 +44,6 @@ framework/base/lib/xercesImpl-2.9.1.jar
framework/base/lib/xml-apis-2.9.1.jar
framework/base/lib/xml-apis-ext-1.3.04.jar
framework/base/lib/commons/commons-beanutils-core-1.8.3.jar
-framework/base/lib/commons/commons-cli-1.2.jar
framework/base/lib/commons/commons-codec-1.10.jar
framework/base/lib/commons/commons-collections-3.2.1.jar
framework/base/lib/commons/commons-compress-1.4.1.jar
Modified: ofbiz/branches/release14.12/macros.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/macros.xml?rev=1677599&r1=1677598&r2=1677599&view=diff
==============================================================================
--- ofbiz/branches/release14.12/macros.xml (original)
+++ ofbiz/branches/release14.12/macros.xml Mon May 4 13:46:58 2015
@@ -48,9 +48,6 @@ under the License.
<patternset id="src.exc.set"/>
<path id="groovy.class.path">
- <pathelement
location="${ofbiz.home.dir}/framework/base/lib/commons/commons-cli-1.0.jar"/>
- <pathelement
location="${ofbiz.home.dir}/framework/base/lib/scripting/antlr-2.7.6.jar"/>
- <pathelement
location="${ofbiz.home.dir}/framework/base/lib/scripting/asm-3.2.jar"/>
<pathelement
location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-2.2.1.jar"/>
</path>
<path id="rhino.class.path">
