Author: jleroux
Date: Wed Feb 5 13:49:12 2014
New Revision: 1564776
URL:
http://svn.apache.org/r1564776Log:
"Applied fix from trunk for revision: 1557409" (changed from 4.4 to 52.1 by hand)
------------------------------------------------------------------------
r1557409 | jleroux | 2014-01-11 15:52:23 +0100 (sam. 11 janv. 2014) | 2 lignes
Updates icu4j-49_1.jar to icu4j-52_1.jar (tests passes)
------------------------------------------------------------------------
Added:
ofbiz/branches/release12.04/framework/base/lib/icu4j-52_1.jar
- copied unchanged from r1557409, ofbiz/trunk/framework/base/lib/icu4j-52_1.jar
Removed:
ofbiz/branches/release12.04/framework/base/lib/icu4j-4_4.jar
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/.classpath
ofbiz/branches/release12.04/LICENSE
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1557409
Modified: ofbiz/branches/release12.04/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1564776&r1=1564775&r2=1564776&view=diff==============================================================================
--- ofbiz/branches/release12.04/.classpath (original)
+++ ofbiz/branches/release12.04/.classpath Wed Feb 5 13:49:12 2014
@@ -36,7 +36,7 @@
<classpathentry kind="lib" path="framework/base/lib/httpmime-4.1.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpunit-1.7.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/icu4j-4_4.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/icu4j-52_1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ivy-2.2.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/javolution-5.4.3.jar"/>
<classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/>
Modified: ofbiz/branches/release12.04/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/LICENSE?rev=1564776&r1=1564775&r2=1564776&view=diff==============================================================================
--- ofbiz/branches/release12.04/LICENSE (original)
+++ ofbiz/branches/release12.04/LICENSE Wed Feb 5 13:49:12 2014
@@ -1219,7 +1219,7 @@ any resulting litigation.
=========================================================================
The following libraries distributed with Apache OFBiz are licensed under the
MIT/X License:
-framework/base/lib/icu4j-4_4.jar
+framework/base/libicu4j-52_1.jar
framework/base/lib/jcl-over-slf4j-1.6.4.jar
framework/entity/lib/ofbiz-minerva.jar
framework/base/lib/slf4j-api-1.6.4.jar