svn commit: r1739555 - in /ofbiz/branches/release15.12: ./ applications/content/lib/ framework/base/lib/ framework/base/lib/commons/

[nmalin]

Author: nmalin
Date: Sun Apr 17 08:50:38 2016
New Revision: 1739555

URL: http://svn.apache.org/viewvc?rev=1739555&view=rev
Log:
Backport from trunk, Uprade the Apache Tika Library :

    tika-parsers-1.7.jar -> tika-parsers-1.12.jar
    tika-core-1.7.jar -> tika-core-1.12.jar

This update induce updating of :

    pdfbox-1.8.5.jar -> pdfbox-1.8.11.jar
    jempbox-1.8.5.jar -> jempbox-1.8.11.jar
    fontbox-1.8.5.jar -> fontbox-1.8.11.jar
    commons-compress-1.9.jar -> commons-compress-1.11.jar

And pdfbox-1.8.11.jar need the introduction of :

    jce-jdk13-154.jar under MIT licence (www.bouncycastle.org)

Apache Tika is needed to test the screenfop on issue OFBIZ-6497. So I move all library from applications/content/lib/ to framework/base/lib/ to didn't create a dependency between widget and content
Related issue OFBIZ-7015

Added:
    ofbiz/branches/release15.12/framework/base/lib/commons/commons-compress-1.11.jar   (with props)
    ofbiz/branches/release15.12/framework/base/lib/fontbox-1.8.11.jar   (with props)
    ofbiz/branches/release15.12/framework/base/lib/jce-jdk13-154.jar   (with props)
    ofbiz/branches/release15.12/framework/base/lib/jempbox-1.8.11.jar   (with props)
    ofbiz/branches/release15.12/framework/base/lib/pdfbox-1.8.11.jar   (with props)
    ofbiz/branches/release15.12/framework/base/lib/tika-core-1.12.jar   (with props)
    ofbiz/branches/release15.12/framework/base/lib/tika-parsers-1.12.jar   (with props)
Removed:
    ofbiz/branches/release15.12/applications/content/lib/fontbox-1.8.5.jar
    ofbiz/branches/release15.12/applications/content/lib/jempbox-1.8.5.jar
    ofbiz/branches/release15.12/applications/content/lib/pdfbox-1.8.5.jar
    ofbiz/branches/release15.12/applications/content/lib/tika-core-1.7.jar
    ofbiz/branches/release15.12/applications/content/lib/tika-parsers-1.7.jar
Modified:
    ofbiz/branches/release15.12/.classpath
    ofbiz/branches/release15.12/LICENSE

Modified: ofbiz/branches/release15.12/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/.classpath?rev=1739555&r1=1739554&r2=1739555&view=diff
==============================================================================
--- ofbiz/branches/release15.12/.classpath (original)
+++ ofbiz/branches/release15.12/.classpath Sun Apr 17 08:50:38 2016
@@ -6,8 +6,6 @@
  <classpathentry kind="lib" path="applications/content/lib/jempbox-1.8.5.jar"/>
  <classpathentry kind="lib" path="applications/content/lib/fontbox-1.8.5.jar"/>
  <classpathentry kind="lib" path="applications/content/lib/poi-3.13-20150929.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/tika-core-1.7.jar"/>
- <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.7.jar"/>
  <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/>
  <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant.jar"/>
@@ -47,6 +45,8 @@
  <classpathentry kind="lib" path="framework/base/lib/serializer-2.9.1.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/shiro-core-1.2.3.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/slf4j-api-1.6.4.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/tika-core-1.12.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/tika-parsers-1.12.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/ws-commons-java5-1.0.1.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/ws-commons-util-1.0.2.jar"/>
  <classpathentry kind="lib" path="framework/base/lib/xalan-2.7.2.jar"/>

Modified: ofbiz/branches/release15.12/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/LICENSE?rev=1739555&r1=1739554&r2=1739555&view=diff
==============================================================================
--- ofbiz/branches/release15.12/LICENSE (original)
+++ ofbiz/branches/release15.12/LICENSE Sun Apr 17 08:50:38 2016
@@ -18,6 +18,7 @@ framework/base/lib/avalon-framework-4.2.
 framework/base/lib/batik-all-1.8.jar
 framework/base/lib/barcode4j-2.1-barcode4j-fop-ext-complete.jar
 framework/base/lib/clhm-release-1.0-lru.jar
+framework/base/lib/fontbox-1.8.11.jar
 framework/base/lib/freemarker-2.3.22.jar
 framework/base/lib/guava-14.0.1.jar
 framework/base/lib/httpclient-4.3.6.jar
@@ -28,6 +29,7 @@ framework/base/lib/jackson-annotations-2
 framework/base/lib/jackson-core-2.4.2.jar
 framework/base/lib/jackson-databind-2.4.2.jar
 framework/base/lib/jakarta-regexp-1.5.jar
+framework/base/lib/jempbox-1.8.11.jar
 framework/base/lib/jpim-0.1.jar
 framework/base/lib/juel-impl-2.2.7.jar
 framework/base/lib/juel-spi-2.2.7.jar
@@ -37,9 +39,12 @@ framework/base/lib/log4j-core-2.3.jar
 framework/base/lib/log4j-nosql-2.3.jar
 framework/base/lib/log4j-slf4j-impl-2.3.jar
 framework/base/lib/nekohtml-1.9.16.jar
+framework/base/lib/pdfbox-1.8.11.jar
 framework/base/lib/resolver-2.9.1.jar
 framework/base/lib/serializer-2.9.1.jar
 framework/base/lib/shiro-core-1.2.3.jar
+framework/base/lib/tika-core-1.12.jar
+framework/base/lib/tika-parsers-1.12.jar
 framework/base/lib/ws-commons-java5-1.0.1.jar
 framework/base/lib/ws-commons-util-1.0.2.jar
 framework/base/lib/xercesImpl-2.9.1.jar
@@ -49,7 +54,7 @@ framework/base/lib/zxing-core-3.2.0.jar
 framework/base/lib/commons/commons-beanutils-core-1.8.3.jar
 framework/base/lib/commons/commons-codec-1.10.jar
 framework/base/lib/commons/commons-collections4-4.1.jar
-framework/base/lib/commons/commons-compress-1.9.jar
+framework/base/lib/commons/commons-compress-1.11.jar
 framework/base/lib/commons/commons-csv-1.1.jar
 framework/base/lib/commons/commons-el-1.0.jar
 framework/base/lib/commons/commons-fileupload-1.3.1.jar
@@ -110,12 +115,7 @@ framework/webapp/lib/ezmorph-0.9.1.jar
 framework/webapp/lib/rome-0.9.jar
 framework/webapp/lib/serializer-2.7.0.jar
 framework/webapp/lib/xalan-2.7.1.jar
-applications/content/lib/fontbox-1.8.5.jar
-applications/content/lib/jempbox-1.8.5.jar
-applications/content/lib/pdfbox-1.8.5.jar
 applications/content/lib/poi-3.13-20150929.jar
-applications/content/lib/tika-core-1.7.jar
-applications/content/lib/tika-parsers-1.7.jar
 applications/product/lib/dozer-4.2.1.jar
 applications/product/lib/watermarker-0.0.4.jar
 tools/security/notsoserial/notsoserial-1.0-SNAPSHOT.jar
@@ -451,6 +451,7 @@ framework/base/lib/hamcrest-all-1.2.jar
 framework/base/lib/httpunit-1.7.jar
 framework/base/lib/ical4j-1.0-rc2.jar
 framework/base/lib/javolution-5.4.3.jar
+framework/base/lib/jce-jdk13-154.jar
 framework/base/lib/xpp3-1.1.4c.jar
 framework/base/lib/xstream-1.4.9.jar
 framework/base/lib/esapi-2.1.0.jar

Added: ofbiz/branches/release15.12/framework/base/lib/commons/commons-compress-1.11.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/base/lib/commons/commons-compress-1.11.jar?rev=1739555&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release15.12/framework/base/lib/commons/commons-compress-1.11.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release15.12/framework/base/lib/fontbox-1.8.11.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/base/lib/fontbox-1.8.11.jar?rev=1739555&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release15.12/framework/base/lib/fontbox-1.8.11.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release15.12/framework/base/lib/jce-jdk13-154.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/base/lib/jce-jdk13-154.jar?rev=1739555&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release15.12/framework/base/lib/jce-jdk13-154.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release15.12/framework/base/lib/jempbox-1.8.11.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/base/lib/jempbox-1.8.11.jar?rev=1739555&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release15.12/framework/base/lib/jempbox-1.8.11.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release15.12/framework/base/lib/pdfbox-1.8.11.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/base/lib/pdfbox-1.8.11.jar?rev=1739555&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release15.12/framework/base/lib/pdfbox-1.8.11.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release15.12/framework/base/lib/tika-core-1.12.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/base/lib/tika-core-1.12.jar?rev=1739555&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release15.12/framework/base/lib/tika-core-1.12.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/branches/release15.12/framework/base/lib/tika-parsers-1.12.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/base/lib/tika-parsers-1.12.jar?rev=1739555&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/branches/release15.12/framework/base/lib/tika-parsers-1.12.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream