svn commit: r1657837 - in /ofbiz/branches/release14.12: ./ .classpath LICENSE applications/content/lib/tika-core-1.0.jar applications/content/lib/tika-core-1.7.jar applications/content/lib/tika-parsers-1.0.jar applications/content/lib/tika-parsers-1.7.jar

Author: jleroux
Date: Fri Feb  6 14:36:13 2015
New Revision: 1657837

URL: http://svn.apache.org/r1657837
Log:
"Applied fix from trunk for revision: 1657790"
------------------------------------------------------------------------
r1657790 | jleroux | 2015-02-06 13:47:45 +0100 (ven. 06 févr. 2015) | 2 lignes

Updates apache Tika jar to 1.7 thanks to Deepak at https://issues.apache.org/jira/browse/OFBIZ-6062

------------------------------------------------------------------------


Added:
    ofbiz/branches/release14.12/applications/content/lib/tika-core-1.7.jar
      - copied unchanged from r1657790, ofbiz/trunk/applications/content/lib/tika-core-1.7.jar
    ofbiz/branches/release14.12/applications/content/lib/tika-parsers-1.7.jar
      - copied unchanged from r1657790, ofbiz/trunk/applications/content/lib/tika-parsers-1.7.jar
Removed:
    ofbiz/branches/release14.12/applications/content/lib/tika-core-1.0.jar
    ofbiz/branches/release14.12/applications/content/lib/tika-parsers-1.0.jar
Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/.classpath
    ofbiz/branches/release14.12/LICENSE

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  6 14:36:13 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657714
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657714,1657790

Modified: ofbiz/branches/release14.12/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/.classpath?rev=1657837&r1=1657836&r2=1657837&view=diff
==============================================================================
--- ofbiz/branches/release14.12/.classpath (original)
+++ ofbiz/branches/release14.12/.classpath Fri Feb  6 14:36:13 2015
@@ -6,8 +6,8 @@
     <classpathentry kind="lib" path="applications/content/lib/pdfbox-1.7.1.jar"/>
     <classpathentry kind="lib" path="applications/content/lib/dom4j-1.6.1.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/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/watermarker-0.0.4.jar"/>
     <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant.jar"/>

Modified: ofbiz/branches/release14.12/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/LICENSE?rev=1657837&r1=1657836&r2=1657837&view=diff
==============================================================================
--- ofbiz/branches/release14.12/LICENSE (original)
+++ ofbiz/branches/release14.12/LICENSE Fri Feb  6 14:36:13 2015
@@ -106,8 +106,8 @@ applications/content/lib/fontbox-1.7.1.j
 applications/content/lib/jempbox-1.7.1.jar
 applications/content/lib/pdfbox-1.7.1.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/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
 framework/images/webapp/images/date/timezones*