svn commit: r1623396 - in /ofbiz/branches/release11.04: ./ applications/content/lib/

Author: jleroux
Date: Mon Sep  8 13:40:35 2014
New Revision: 1623396

URL: http://svn.apache.org/r1623396
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/release11.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/release11.04/applications/content/lib/poi-3.7.jar
    ofbiz/branches/release11.04/applications/content/lib/poi-ooxml-3.7.jar
    ofbiz/branches/release11.04/applications/content/lib/poi-ooxml-schemas-3.7.jar
    ofbiz/branches/release11.04/applications/content/lib/poi-scratchpad-3.7.jar
Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/.classpath
    ofbiz/branches/release11.04/LICENSE

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1623370

Modified: ofbiz/branches/release11.04/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/.classpath?rev=1623396&r1=1623395&r2=1623396&view=diff
==============================================================================
--- ofbiz/branches/release11.04/.classpath (original)
+++ ofbiz/branches/release11.04/.classpath Mon Sep  8 13:40:35 2014
@@ -7,9 +7,7 @@
   <classpathentry kind="lib" path="applications/content/lib/lucene-core-3.0.3.jar"/>
   <classpathentry kind="lib" path="applications/content/lib/metadata-extractor-2.4.0-beta-1.jar"/>
   <classpathentry kind="lib" path="applications/content/lib/pdfbox-1.4.0.jar"/>
-  <classpathentry kind="lib" path="applications/content/lib/poi-3.7.jar"/>
-  <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.7.jar"/>
-  <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.7.jar"/>
+  <classpathentry kind="lib" path="applications/content/lib/poi-3.10.1-20140818.jar"/>
   <classpathentry kind="lib" path="applications/content/lib/tika-core-0.9.jar"/>
   <classpathentry kind="lib" path="applications/content/lib/tika-parsers-0.9.jar"/>
   <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/>

Modified: ofbiz/branches/release11.04/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/LICENSE?rev=1623396&r1=1623395&r2=1623396&view=diff
==============================================================================
--- ofbiz/branches/release11.04/LICENSE (original)
+++ ofbiz/branches/release11.04/LICENSE Mon Sep  8 13:40:35 2014
@@ -122,9 +122,7 @@ ofbiz/trunk/applications/content/lib/jem
 ofbiz/trunk/applications/content/lib/lucene-core-3.0.3.jar
 ofbiz/trunk/applications/content/lib/metadata-extractor-2.4.0.jar
 ofbiz/trunk/applications/content/lib/pdfbox-1.4.0.jar
-ofbiz/trunk/applications/content/lib/poi-3.7.jar
-ofbiz/trunk/applications/content/lib/poi-ooxml-3.7.jar
-ofbiz/trunk/applications/content/lib/poi-scratchpad-3.7.jar
+ofbiz/trunk/applications/content/lib/poi-3.10.1-20140818.jar
 ofbiz/trunk/applications/content/lib/tika-core-0.9.jar
 ofbiz/trunk/applications/content/lib/tika-parsers-0.9.jar
 ofbiz/trunk/applications/product/lib/dozer-4.2.1.jar