Author: jacopoc
Date: Fri Sep 20 05:01:50 2013
New Revision: 1524902
URL: http://svn.apache.org/r1524902
Log:
Applied fix from trunk for revision: 1524835
===
Upgraded Fop to 1.1 (the latest bug fix release) and barcode4j to 2.1 (version
compatible with Fop 1.1).
Added:
ofbiz/branches/release13.07/framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar
- copied unchanged from r1524835,
ofbiz/trunk/framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar
ofbiz/branches/release13.07/framework/base/lib/fop-1.1.jar
- copied unchanged from r1524835,
ofbiz/trunk/framework/base/lib/fop-1.1.jar
ofbiz/branches/release13.07/framework/base/lib/xmlgraphics-commons-1.5.jar
- copied unchanged from r1524835,
ofbiz/trunk/framework/base/lib/xmlgraphics-commons-1.5.jar
Removed:
ofbiz/branches/release13.07/framework/base/lib/barcode4j-fop-ext-complete-2.0.jar
ofbiz/branches/release13.07/framework/base/lib/fop-1.0.jar
ofbiz/branches/release13.07/framework/base/lib/xmlgraphics-commons-1.4.jar
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/.classpath
ofbiz/branches/release13.07/LICENSE
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1524835
Modified: ofbiz/branches/release13.07/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/.classpath?rev=1524902&r1=1524901&r2=1524902&view=diff
==============================================================================
--- ofbiz/branches/release13.07/.classpath (original)
+++ ofbiz/branches/release13.07/.classpath Fri Sep 20 05:01:50 2013
@@ -22,11 +22,11 @@
<classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/avalon-framework-4.2.0.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/avalon-util-exception-1.0.0.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/barcode4j-fop-ext-complete-2.0.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar"/>
<classpathentry kind="lib" path="framework/base/lib/batik-all-1.7.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/clhm-release-1.0-lru.jar"/>
<classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/>
- <classpathentry kind="lib" path="framework/base/lib/fop-1.0.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/fop-1.1.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/freemarker-2.3.19-null-wildcards.jar"/>
<classpathentry kind="lib" path="framework/base/lib/httpclient-4.2.1.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/httpclient-cache-4.2.1.jar"/>
@@ -57,7 +57,7 @@
<classpathentry kind="lib"
path="framework/base/lib/ws-commons-util-1.0.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/xml-apis-2.9.1.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/xml-apis-ext-1.3.04.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/xmlgraphics-commons-1.4.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/xmlgraphics-commons-1.5.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/xmlrpc-client-3.1.2.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/xmlrpc-common-3.1.2.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/xmlrpc-server-3.1.2.jar"/>
Modified: ofbiz/branches/release13.07/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/LICENSE?rev=1524902&r1=1524901&r2=1524902&view=diff
==============================================================================
--- ofbiz/branches/release13.07/LICENSE (original)
+++ ofbiz/branches/release13.07/LICENSE Fri Sep 20 05:01:50 2013
@@ -18,7 +18,7 @@ framework/base/lib/ant/ant-nodeps-1.8.1.
framework/base/lib/avalon-framework-4.2.0.jar
framework/base/lib/avalon-util-exception-1.0.0.jar
framework/base/lib/batik-all-1.7.jar
-framework/base/lib/barcode4j-fop-ext-complete-2.0.jar
+framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar
framework/base/lib/clhm-release-1.0-lru.jar
framework/base/lib/httpclient-4.2.1.jar
framework/base/lib/httpclient-cache-4.2.1.jar
@@ -90,9 +90,9 @@ framework/service/lib/axis2-transport-lo
framework/service/lib/commons-httpclient-3.1.jar
framework/service/lib/neethi-2.0.4.jar
framework/service/lib/XmlSchema-1.4.3.jar
-framework/webapp/lib/fop-1.0.jar
+framework/webapp/lib/fop-1.1.jar
framework/webapp/lib/velocity-1.6.1.jar
-framework/webapp/lib/xmlgraphics-commons-1.4.jar
+framework/webapp/lib/xmlgraphics-commons-1.5.jar
framework/webapp/lib/json-lib-2.2.3-jdk15.jar
framework/webapp/lib/ezmorph-0.9.1.jar
framework/webapp/lib/rome-0.9.jar
