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 2014/10/16 10:31:43 UTC
svn commit: r1632238 - in /manifoldcf/branches/CONNECTORS-1074:
connectors/tika/build.xml connectors/tika/pom.xml framework/build.xml
framework/buildfiles/connector-build.xml framework/core/pom.xml pom.xml
Author: kwright
Date: Thu Oct 16 08:31:42 2014
New Revision: 1632238
URL: http://svn.apache.org/r1632238
Log:
Move tika-core to a dependency of mcf-core
Modified:
manifoldcf/branches/CONNECTORS-1074/connectors/tika/build.xml
manifoldcf/branches/CONNECTORS-1074/connectors/tika/pom.xml
manifoldcf/branches/CONNECTORS-1074/framework/build.xml
manifoldcf/branches/CONNECTORS-1074/framework/buildfiles/connector-build.xml
manifoldcf/branches/CONNECTORS-1074/framework/core/pom.xml
manifoldcf/branches/CONNECTORS-1074/pom.xml
Modified: manifoldcf/branches/CONNECTORS-1074/connectors/tika/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1074/connectors/tika/build.xml?rev=1632238&r1=1632237&r2=1632238&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1074/connectors/tika/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1074/connectors/tika/build.xml Thu Oct 16 08:31:42 2014
@@ -36,7 +36,6 @@
<include name="jackson-core*.jar"/>
<include name="jackson-databind*.jar"/>
<include name="jackson-annotations*.jar"/>
- <include name="tika-core*.jar"/>
<include name="tika-parsers*.jar"/>
<include name="tagsoup*.jar"/>
<include name="poi*.jar"/>
@@ -80,7 +79,6 @@
<include name="jackson-core*.jar"/>
<include name="jackson-databind*.jar"/>
<include name="jackson-annotations*.jar"/>
- <include name="tika-core*.jar"/>
<include name="tika-parsers*.jar"/>
<include name="tagsoup*.jar"/>
<include name="poi*.jar"/>
Modified: manifoldcf/branches/CONNECTORS-1074/connectors/tika/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1074/connectors/tika/pom.xml?rev=1632238&r1=1632237&r2=1632238&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1074/connectors/tika/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1074/connectors/tika/pom.xml Thu Oct 16 08:31:42 2014
@@ -213,13 +213,8 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>1.6</version>
+ <version>${tika.version}</version>
</dependency>
<!-- Testing dependencies -->
Modified: manifoldcf/branches/CONNECTORS-1074/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1074/framework/build.xml?rev=1632238&r1=1632237&r2=1632238&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1074/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1074/framework/build.xml Thu Oct 16 08:31:42 2014
@@ -31,6 +31,9 @@
<path id="framework-classpath">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -330,6 +333,9 @@
<mkdir dir="build/webapp/authority-service/WEB-INF/lib"/>
<copy todir="build/webapp/authority-service/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -381,6 +387,9 @@
<mkdir dir="build/webapp/authority-service-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/authority-service-proprietary/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -437,6 +446,9 @@
<mkdir dir="build/webapp/api-service/WEB-INF/lib"/>
<copy todir="build/webapp/api-service/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -489,6 +501,9 @@
<mkdir dir="build/webapp/api-service-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/api-service-proprietary/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -546,6 +561,9 @@
<mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
<copy todir="build/webapp/crawler-ui/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -606,6 +624,9 @@
<mkdir dir="build/webapp/crawler-ui-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -673,6 +694,9 @@
<mkdir dir="build/webapp/combined-service/WEB-INF/lib"/>
<copy todir="build/webapp/combined-service/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -735,6 +759,9 @@
<mkdir dir="build/webapp/combined-service-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/combined-service-proprietary/WEB-INF/lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -866,6 +893,9 @@
<mkdir dir="dist/lib"/>
<copy todir="dist/lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
<include name="commons-discovery*.jar"/>
@@ -1116,6 +1146,7 @@
<path id="process-lib">
<fileset dir="../lib">
+ <include name="tika-core*.jar"/>
<include name="commons-lang*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
Modified: manifoldcf/branches/CONNECTORS-1074/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1074/framework/buildfiles/connector-build.xml?rev=1632238&r1=1632237&r2=1632238&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1074/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1074/framework/buildfiles/connector-build.xml Thu Oct 16 08:31:42 2014
@@ -140,6 +140,9 @@
<include name="velocity*.jar"/>
</fileset>
<fileset dir="${mcf-dist}/lib">
+ <include name="tika-core*.jar"/>
+ </fileset>
+ <fileset dir="${mcf-dist}/lib">
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
Modified: manifoldcf/branches/CONNECTORS-1074/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1074/framework/core/pom.xml?rev=1632238&r1=1632237&r2=1632238&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1074/framework/core/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1074/framework/core/pom.xml Thu Oct 16 08:31:42 2014
@@ -110,6 +110,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${tika.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${activation.version}</version>
Modified: manifoldcf/branches/CONNECTORS-1074/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1074/pom.xml?rev=1632238&r1=1632237&r2=1632238&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1074/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1074/pom.xml Thu Oct 16 08:31:42 2014
@@ -79,6 +79,7 @@
<zookeeper.version>3.4.6</zookeeper.version>
<xmlbeans.version>2.6.0</xmlbeans.version>
<poi.version>3.11-beta2</poi.version>
+ <tika.version>1.6</tika.version>
</properties>
<modules>