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/02/22 08:36:33 UTC
svn commit: r1783976 - in /manifoldcf/trunk: build.xml
connectors/tika/pom.xml framework/connector-common/pom.xml pom.xml
Author: kwright
Date: Wed Feb 22 08:36:32 2017
New Revision: 1783976
URL: http://svn.apache.org/viewvc?rev=1783976&view=rev
Log:
Remove special stuff around jhighlight for tika parsers
Modified:
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/tika/pom.xml
manifoldcf/trunk/framework/connector-common/pom.xml
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1783976&r1=1783975&r2=1783976&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Wed Feb 22 08:36:32 2017
@@ -107,7 +107,7 @@
<property name="vorbis.version" value="0.8"/>
<property name="metadata-extractor.version" value="2.8.1"/>
<property name="aspectjrt.version" value="1.8.6"/>
- <property name="jhighlight.version" value="1.0.3"/>
+ <property name="jhighlight.version" value="1.0.2"/>
<property name="xmlbeans.version" value="2.6.0"/>
<property name="bc.version" value="1.54"/>
<property name="tukaani.version" value="1.5"/>
Modified: manifoldcf/trunk/connectors/tika/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/tika/pom.xml?rev=1783976&r1=1783975&r2=1783976&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/tika/pom.xml (original)
+++ manifoldcf/trunk/connectors/tika/pom.xml Wed Feb 22 08:36:32 2017
@@ -203,48 +203,15 @@
<artifactId>httpclient</artifactId>
<version>${httpcomponent.httpclient.version}</version>
</dependency>
- <!--Removed, because these are not needed and mess up the dependency tree.
- dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.1.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.3.0</version>
- </dependency -->
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>${tika.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jhighlight</artifactId>
- <groupId>com.uwyn</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>${tika.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jhighlight</artifactId>
- <groupId>com.uwyn</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codelibs</groupId>
- <artifactId>jhighlight</artifactId>
- <version>${jhighlight.version}</version>
</dependency>
<dependency>
<groupId>de.l3s.boilerpipe</groupId>
Modified: manifoldcf/trunk/framework/connector-common/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/connector-common/pom.xml?rev=1783976&r1=1783975&r2=1783976&view=diff
==============================================================================
--- manifoldcf/trunk/framework/connector-common/pom.xml (original)
+++ manifoldcf/trunk/framework/connector-common/pom.xml Wed Feb 22 08:36:32 2017
@@ -82,18 +82,12 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>${tika.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jhighlight</artifactId>
- <groupId>com.uwyn</groupId>
- </exclusion>
- </exclusions>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.codelibs</groupId>
<artifactId>jhighlight</artifactId>
<version>${jhighlight.version}</version>
- </dependency>
+ </dependency -->
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1783976&r1=1783975&r2=1783976&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Wed Feb 22 08:36:32 2017
@@ -85,7 +85,7 @@
<xmlbeans.version>2.6.0</xmlbeans.version>
<poi.version>3.15-beta1</poi.version>
<tika.version>1.13</tika.version>
- <jhighlight.version>1.0.3</jhighlight.version>
+ <!-- jhighlight.version>1.0.3</jhighlight.version -->
<boilerpipe.version>1.1.0</boilerpipe.version>
<hadoop.version>2.6.0</hadoop.version>
<tomcat.version>6.0.35</tomcat.version>