You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2017/08/31 17:13:14 UTC
svn commit: r1806826 - in /manifoldcf/branches/release-2.8-branch: ./
CHANGES.txt build.xml connectors/gts/build.xml framework/build.xml
framework/buildfiles/connector-build.xml pom.xml
Author: kwright
Date: Thu Aug 31 17:13:14 2017
New Revision: 1806826
URL: http://svn.apache.org/viewvc?rev=1806826&view=rev
Log:
Pull up fix for CONNECTORS-1450 from trunk.
Modified:
manifoldcf/branches/release-2.8-branch/ (props changed)
manifoldcf/branches/release-2.8-branch/CHANGES.txt
manifoldcf/branches/release-2.8-branch/build.xml
manifoldcf/branches/release-2.8-branch/connectors/gts/build.xml
manifoldcf/branches/release-2.8-branch/framework/build.xml
manifoldcf/branches/release-2.8-branch/framework/buildfiles/connector-build.xml
manifoldcf/branches/release-2.8-branch/pom.xml
Propchange: manifoldcf/branches/release-2.8-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 31 17:13:14 2017
@@ -149,3 +149,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
+/manifoldcf/trunk:1806824
Modified: manifoldcf/branches/release-2.8-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.8-branch/CHANGES.txt?rev=1806826&r1=1806825&r2=1806826&view=diff
==============================================================================
--- manifoldcf/branches/release-2.8-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.8-branch/CHANGES.txt Thu Aug 31 17:13:14 2017
@@ -3,6 +3,12 @@ $Id$
======================= Release 2.8.1 =====================
+CONNECTORS-1450: Tika extractor cannot process MS Office files due
+to a dependency problem. The dependency issue is that poi-ooxml-schemas
+is apparently accessed via reflection, and the class lookup does not
+apparently use the current classloader, but rather some other classloader.
+This requires the entire poi* set of jars, and all dependencies, to be
+included in ManifoldCF's core jar list.
======================= Release 2.8 =====================
Modified: manifoldcf/branches/release-2.8-branch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.8-branch/build.xml?rev=1806826&r1=1806825&r2=1806826&view=diff
==============================================================================
--- manifoldcf/branches/release-2.8-branch/build.xml (original)
+++ manifoldcf/branches/release-2.8-branch/build.xml Thu Aug 31 17:13:14 2017
@@ -56,7 +56,7 @@
<property name="commons-cli.version" value="1.2"/>
<property name="slf4j.version" value="1.7.7"/>
<property name="xalan.version" value="2.7.1"/>
- <property name="poi.version" value="3.15"/>
+ <property name="poi.version" value="3.9"/>
<property name="activation.version" value="1.1.1"/>
<property name="avalon.version" value="4.3.1"/>
<property name="ecj.version" value="4.3.1"/>
Modified: manifoldcf/branches/release-2.8-branch/connectors/gts/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.8-branch/connectors/gts/build.xml?rev=1806826&r1=1806825&r2=1806826&view=diff
==============================================================================
--- manifoldcf/branches/release-2.8-branch/connectors/gts/build.xml (original)
+++ manifoldcf/branches/release-2.8-branch/connectors/gts/build.xml Thu Aug 31 17:13:14 2017
@@ -30,22 +30,6 @@
<import file="${mcf-dist}/connector-build.xml"/>
- <path id="connector-classpath">
- <path refid="mcf-connector-build.connector-classpath"/>
- <fileset dir="../../lib">
- <include name="poi*.jar"/>
- </fileset>
- </path>
-
- <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
- <fileset dir="../../lib">
- <include name="poi*.jar"/>
- </fileset>
- </copy>
- </target>
-
<target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
<antcall target="general-add-output-connector">
<param name="connector-label" value="MetaCarta GTS"/>
Modified: manifoldcf/branches/release-2.8-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.8-branch/framework/build.xml?rev=1806826&r1=1806825&r2=1806826&view=diff
==============================================================================
--- manifoldcf/branches/release-2.8-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-2.8-branch/framework/build.xml Thu Aug 31 17:13:14 2017
@@ -46,6 +46,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections-*.jar"/>
+ <include name="commons-collections4-*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -68,6 +69,10 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -129,7 +134,6 @@
<include name="quartz*.jar"/>
<include name="c3p0*.jar"/>
<include name="tagsoup*.jar"/>
- <include name="poi*.jar"/>
<include name="vorbis-java*.jar"/>
<include name="apache-mime4j-core*.jar"/>
<include name="apache-mime4j-dom*.jar"/>
@@ -140,9 +144,6 @@
<include name="bcmail-jdk15on*.jar"/>
<include name="bcprov-jdk15on*.jar"/>
<include name="bcpkix-jdk15on*.jar"/>
- <include name="curvesapi*.jar"/>
- <include name="xmlbeans*.jar"/>
- <include name="dom4j*.jar"/>
<include name="geronimo-stax-api_1.0_spec*.jar"/>
<include name="asm*.jar"/>
<include name="isoparser*.jar"/>
@@ -480,6 +481,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -494,6 +496,10 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -523,6 +529,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -537,6 +544,10 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -572,6 +583,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -586,6 +598,10 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -616,6 +632,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -630,6 +647,10 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -667,6 +688,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -682,6 +704,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -723,6 +749,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -738,6 +765,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -783,6 +814,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -798,6 +830,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -837,6 +873,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -852,6 +889,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -960,6 +1001,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -976,6 +1018,10 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -1202,6 +1248,7 @@
<include name="commons-lang*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="commons-io*.jar"/>
@@ -1224,6 +1271,10 @@
<include name="httpcore*.jar"/>
<include name="httpclient*.jar"/>
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="gson*.jar"/>
<include name="guava*.jar"/>
@@ -1507,7 +1558,6 @@
<include name="quartz*.jar"/>
<include name="c3p0*.jar"/>
<include name="tagsoup*.jar"/>
- <include name="poi*.jar"/>
<include name="vorbis-java*.jar"/>
<include name="netcdf*.jar"/>
<include name="unidataCommon*.jar"/>
@@ -1523,9 +1573,6 @@
<include name="bcmail-jdk15*.jar"/>
<include name="bcprov-jdk15*.jar"/>
<include name="bcpkix-jdk15*.jar"/>
- <include name="curvesapi*.jar"/>
- <include name="xmlbeans*.jar"/>
- <include name="dom4j*.jar"/>
<include name="geronimo-stax-api_1.0_spec*.jar"/>
<include name="asm*.jar"/>
<include name="isoparser*.jar"/>
Modified: manifoldcf/branches/release-2.8-branch/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.8-branch/framework/buildfiles/connector-build.xml?rev=1806826&r1=1806825&r2=1806826&view=diff
==============================================================================
--- manifoldcf/branches/release-2.8-branch/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/release-2.8-branch/framework/buildfiles/connector-build.xml Thu Aug 31 17:13:14 2017
@@ -116,6 +116,10 @@
</fileset>
<fileset dir="${mcf-dist}/lib">
<include name="mail*.jar"/>
+ <include name="poi*.jar"/>
+ <include name="dom4j*.jar"/>
+ <include name="xmlbeans*.jar"/>
+ <include name="curvesapi*.jar"/>
<include name="commons-exec*.jar"/>
<include name="guava*.jar"/>
<include name="gson*.jar"/>
@@ -123,6 +127,7 @@
<include name="json-simple*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
+ <include name="commons-collections4*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -179,7 +184,6 @@
<include name="quartz*.jar"/>
<include name="c3p0*.jar"/>
<include name="tagsoup*.jar"/>
- <include name="poi*.jar"/>
<include name="vorbis-java*.jar"/>
<include name="apache-mime4j-core*.jar"/>
<include name="apache-mime4j-dom*.jar"/>
@@ -190,9 +194,6 @@
<include name="bcmail-jdk15on*.jar"/>
<include name="bcprov-jdk15on*.jar"/>
<include name="bcpkix-jdk15on*.jar"/>
- <include name="curvesapi*.jar"/>
- <include name="xmlbeans*.jar"/>
- <include name="dom4j*.jar"/>
<include name="geronimo-stax-api_1.0_spec*.jar"/>
<include name="asm*.jar"/>
<include name="isoparser*.jar"/>
Modified: manifoldcf/branches/release-2.8-branch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.8-branch/pom.xml?rev=1806826&r1=1806825&r2=1806826&view=diff
==============================================================================
--- manifoldcf/branches/release-2.8-branch/pom.xml (original)
+++ manifoldcf/branches/release-2.8-branch/pom.xml Thu Aug 31 17:13:14 2017
@@ -83,7 +83,7 @@
<jaxb.version>2.2.6</jaxb.version>
<zookeeper.version>3.4.8</zookeeper.version>
<xmlbeans.version>2.6.0</xmlbeans.version>
- <poi.version>3.15-beta1</poi.version>
+ <poi.version>3.9</poi.version>
<tika.version>1.14</tika.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
<hadoop.version>2.6.0</hadoop.version>