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 2015/03/27 02:00:15 UTC
svn commit: r1669487 - in /manifoldcf/trunk: build.xml
connectors/tika/pom.xml framework/connector-common/pom.xml pom.xml
Author: kwright
Date: Fri Mar 27 01:00:15 2015
New Revision: 1669487
URL: http://svn.apache.org/r1669487
Log:
Fix for CONNECTORS-1174.
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=1669487&r1=1669486&r2=1669487&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Mar 27 01:00:15 2015
@@ -105,7 +105,7 @@
<property name="vorbis.version" value="0.6"/>
<property name="metadata-extractor.version" value="2.6.2"/>
<property name="aspectjrt.version" value="1.8.0"/>
- <property name="jhighlight.version" value="1.0"/>
+ <property name="jhighlight.version" value="1.0.2"/>
<property name="xmlbeans.version" value="2.6.0"/>
<property name="bc.version" value="1.45"/>
<property name="tukaani.version" value="1.5"/>
@@ -1746,7 +1746,7 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
- <param name="project-path" value="com/uwyn"/>
+ <param name="project-path" value="org/codelibs"/>
<param name="artifact-name" value="jhighlight"/>
<param name="artifact-version" value="${jhighlight.version}"/>
<param name="artifact-type" value="jar"/>
Modified: manifoldcf/trunk/connectors/tika/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/tika/pom.xml?rev=1669487&r1=1669486&r2=1669487&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/tika/pom.xml (original)
+++ manifoldcf/trunk/connectors/tika/pom.xml Fri Mar 27 01:00:15 2015
@@ -220,11 +220,28 @@
<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=1669487&r1=1669486&r2=1669487&view=diff
==============================================================================
--- manifoldcf/trunk/framework/connector-common/pom.xml (original)
+++ manifoldcf/trunk/framework/connector-common/pom.xml Fri Mar 27 01:00:15 2015
@@ -81,6 +81,17 @@
<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.codelibs</groupId>
+ <artifactId>jhighlight</artifactId>
+ <version>${jhighlight.version}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1669487&r1=1669486&r2=1669487&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Fri Mar 27 01:00:15 2015
@@ -85,6 +85,7 @@
<xmlbeans.version>2.6.0</xmlbeans.version>
<poi.version>3.11</poi.version>
<tika.version>1.7</tika.version>
+ <jhighlight.version>1.0.2</jhighlight.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
</properties>