svn commit: r1623391 - in /ofbiz/branches/release12.04: ./ applications/content/lib/

Author: jleroux
Date: Mon Sep  8 13:36:12 2014
New Revision: 1623391

URL: http://svn.apache.org/r1623391
Log:
"Applied fix from trunk for revision: 1623370" (conflicts handled by hand, I also removed the poi*.jar optional files)
------------------------------------------------------------------------
r1623370 | jleroux | 2014-09-08 14:27:35 +0200 (lun. 08 sept. 2014) | 1 ligne

Updates from poi-3.9-20121203.jar to poi-3.10.1-20140818.jar for security reasons
------------------------------------------------------------------------

Added:
    ofbiz/branches/release12.04/applications/content/lib/poi-3.10.1-20140818.jar
      - copied unchanged from r1623370, ofbiz/trunk/applications/content/lib/poi-3.10.1-20140818.jar
Removed:
    ofbiz/branches/release12.04/applications/content/lib/poi-3.8-20120326.jar
    ofbiz/branches/release12.04/applications/content/lib/poi-ooxml-3.8-20120326.jar
    ofbiz/branches/release12.04/applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar
    ofbiz/branches/release12.04/applications/content/lib/poi-scratchpad-3.8-20120326.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:r1623370

Modified: ofbiz/branches/release12.04/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1623391&r1=1623390&r2=1623391&view=diff
==============================================================================
--- ofbiz/branches/release12.04/.classpath (original)
+++ ofbiz/branches/release12.04/.classpath Mon Sep  8 13:36:12 2014
@@ -7,10 +7,7 @@
     <classpathentry kind="lib" path="applications/content/lib/lucene-core-3.5.0.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/pdfbox-1.4.0.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/dom4j-1.6.1.jar"/>
-    <classpathentry kind="lib" path="applications/content/lib/poi-3.8-20120326.jar"/>
-    <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.8-20120326.jar"/>
-    <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar"/>
-    <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.8-20120326.jar"/>
+    <classpathentry kind="lib" path="applications/content/lib/poi-3.10.1-20140818.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/tika-core-1.0.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/>
     <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/>

Modified: ofbiz/branches/release12.04/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/LICENSE?rev=1623391&r1=1623390&r2=1623391&view=diff
==============================================================================
--- ofbiz/branches/release12.04/LICENSE (original)
+++ ofbiz/branches/release12.04/LICENSE Mon Sep  8 13:36:12 2014
@@ -113,10 +113,7 @@ applications/content/lib/fontbox-1.4.0.j
 applications/content/lib/jempbox-1.4.0.jar
 applications/content/lib/lucene-core-3.5.0.jar
 applications/content/lib/pdfbox-1.4.0.jar
-applications/content/lib/poi-3.8-20120326.jar
-applications/content/lib/poi-ooxml-3.8-20120326.jar
-applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar
-applications/content/lib/poi-scratchpad-3.8-20120326.jar
+applications/content/lib/poi-3.10.1-20140818.jar
 applications/content/lib/tika-core-1.0.jar
 applications/content/lib/tika-parsers-1.0.jar
 applications/product/lib/dozer-4.2.1.jar