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 10:50:21 UTC
svn commit: r1784010 - in /manifoldcf/trunk: build.xml framework/build.xml
framework/connector-common/pom.xml pom.xml
Author: kwright
Date: Wed Feb 22 10:50:20 2017
New Revision: 1784010
URL: http://svn.apache.org/viewvc?rev=1784010&view=rev
Log:
Go to tika 1.14, and add some missing Tika dependencies.
Modified:
manifoldcf/trunk/build.xml
manifoldcf/trunk/framework/build.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=1784010&r1=1784009&r2=1784010&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Wed Feb 22 10:50:20 2017
@@ -46,6 +46,7 @@
<property name="wsdl4j.version" value="1.6.2"/>
<property name="commons-codec.version" value="1.10"/>
<property name="commons-collections.version" value="3.2.1"/>
+ <property name="commons-collections4.version" value="4.1"/>
<property name="commons-discovery.version" value="0.5"/>
<property name="commons-el.version" value="1.0"/>
<property name="commons-fileupload.version" value="1.2.2"/>
@@ -56,7 +57,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-beta1"/>
+ <property name="poi.version" value="3.15"/>
<property name="activation.version" value="1.1.1"/>
<property name="avalon.version" value="4.3.1"/>
<property name="ecj.version" value="4.3.1"/>
@@ -92,69 +93,72 @@
<property name="json-simple.version" value="1.1.1"/>
<property name="google-api-client.version" value="v2-rev136-1.19.0"/>
<property name="google-http-client.version" value="1.19.0"/>
- <property name="jackson-core.version" value="2.7.1"/>
+ <property name="jackson-core.version" value="2.8.1"/>
<property name="jetty-jsp-jdt.version" value="2.3.3"/>
<property name="jetty-schemas.version" value="3.1.M0"/>
<property name="alfresco-indexer.version" value="0.8.1"/>
- <property name="gson.version" value="2.6.2"/>
+ <property name="gson.version" value="2.2.4"/>
<property name="guava.version" value="18.0"/>
<property name="mockito.version" value="1.9.5"/>
<property name="wiremock.version" value="2.5.1"/>
<property name="objenesis.version" value="2.1"/>
- <property name="tika.version" value="1.13"/>
+ <property name="tika.version" value="1.14"/>
<property name="tagsoup.version" value="1.2.1"/>
<property name="james.version" value="0.7.2"/>
<property name="vorbis.version" value="0.8"/>
- <property name="metadata-extractor.version" value="2.8.1"/>
+ <property name="metadata-extractor.version" value="2.9.1"/>
<property name="aspectjrt.version" value="1.8.6"/>
<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"/>
- <property name="pdfbox.version" value="2.0.1"/>
+ <property name="pdfbox.version" value="2.0.3"/>
<property name="jempbox.version" value="1.8.12"/>
- <property name="commons-compress.version" value="1.11"/>
- <property name="commons-csv.version" value="1.2"/>
+ <property name="commons-compress.version" value="1.12"/>
+ <property name="commons-csv.version" value="1.0"/>
<property name="commons-exec.version" value="1.3"/>
<property name="juniversalchardet.version" value="1.0.3"/>
<property name="ucar.version" value="4.5.5"/>
- <property name="jcommander.version" value="1.48"/>
- <property name="protobuf.version" value="2.6.1"/>
+ <property name="jna.version" value="4.1.0"/>
+ <property name="jcommander.version" value="1.35"/>
+ <property name="protobuf.version" value="2.5.0"/>
<property name="jcip-annotations.version" value="1.0"/>
- <property name="ehcache.version" value="2.6.11"/>
+ <property name="ehcache.version" value="2.6.2"/>
<property name="bzip2.version" value="0.9.1"/>
- <property name="jdom2.version" value="2.0.6"/>
- <property name="quartz.version" value="2.2.1"/>
+ <property name="jdom2.version" value="2.0.4"/>
+ <property name="quartz.version" value="2.2.0"/>
<property name="boilerpipe.version" value="1.1.0"/>
<property name="dom4j.version" value="1.6.1"/>
- <property name="asm.version" value="5.1"/>
+ <property name="asm.version" value="5.0.4"/>
<property name="xmpcore.version" value="5.1.2"/>
- <property name="rome.version" value="1.6.0"/>
+ <property name="rome.version" value="1.5.1"/>
<property name="jdom2.version" value="2.0.6"/>
<property name="mp4parser.version" value="1.1.18"/>
- <property name="jmatio.version" value="1.0"/>
+ <property name="jmatio.version" value="1.2"/>
<property name="java-libpst.version" value="0.8.1"/>
<property name="commons-httpclient.version" value="3.1"/>
<property name="jackson-databind.version" value="2.6.1"/>
<property name="jackson-annotations.version" value="2.6.1"/>
<property name="resteasy.client.version" value="3.0.16.Final"/>
- <property name="jsoup.version" value="1.8.1"/>
+ <property name="jsoup.version" value="1.7.2"/>
+ <property name="jj2000.version" value="5.2"/>
<property name="hadoop.version" value="2.6.0"/>
<property name="aws-sdk.version" value="1.9.0"/>
- <property name="joda-time.version" value="2.8.2"/>
+ <property name="joda-time.version" value="2.9.7"/>
<property name="junrar.version" value="0.7"/>
- <property name="jackcess.version" value="2.1.3"/>
+ <property name="jackcess.version" value="2.1.4"/>
<property name="jackcess-encrypt.version" value="2.1.1"/>
<property name="opennlp.version" value="1.6.0"/>
<property name="sis.version" value="0.6"/>
<property name="opengis.version" value="3.0.0"/>
+ <property name="jsr-275.version" value="0.9.3"/>
<property name="commons-vfs2.version" value="2.0"/>
- <property name="c3p0.version" value="0.9.5.1"/>
- <property name="cxf.version" value="3.1.6"/>
- <property name="xmlschema.version" value="2.2.1"/>
+ <property name="c3p0.version" value="0.9.1.1"/>
+ <property name="cxf.version" value="3.0.3"/>
+ <property name="xmlschema.version" value="2.1.0"/>
<property name="annotation-api.version" value="1.2"/>
<property name="javax.ws.rs-api.version" value="2.0.1"/>
- <property name="virtuald.version" value="1.03"/>
+ <property name="virtuald.version" value="1.04"/>
<property name="rat.bootstrap.version" value="0.12"/>
<property name="rat_checksum_sha1" value="16398550402b27f81cd0d508cef54b3e47a4a6da"/>
<property name="rat_install_path" location="${user.home}/.ant/lib" />
@@ -1202,6 +1206,12 @@ 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="org/apache/commons"/>
+ <param name="artifact-version" value="${commons-collections4.version}"/>
+ <param name="artifact-name" value="commons-collections4"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="commons-discovery"/>
<param name="artifact-version" value="${commons-discovery.version}"/>
<param name="artifact-name" value="commons-discovery"/>
@@ -2008,7 +2018,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/mchange"/>
+ <param name="project-path" value="c3p0"/>
<param name="artifact-version" value="${c3p0.version}"/>
<param name="artifact-name" value="c3p0"/>
<param name="artifact-type" value="jar"/>
@@ -2056,6 +2066,12 @@ 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="javax/measure"/>
+ <param name="artifact-version" value="${jsr-275.version}"/>
+ <param name="artifact-name" value="jsr-275"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/apache/sis/core"/>
<param name="artifact-version" value="${sis.version}"/>
<param name="artifact-name" value="sis-metadata"/>
@@ -2158,6 +2174,18 @@ 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="net/java/dev/jna"/>
+ <param name="artifact-name" value="jna"/>
+ <param name="artifact-version" value="${jna.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="edu/ucar"/>
+ <param name="artifact-name" value="jj2000"/>
+ <param name="artifact-version" value="${jj2000.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/ccil/cowan/tagsoup"/>
<param name="artifact-version" value="${tagsoup.version}"/>
<param name="artifact-name" value="tagsoup"/>
@@ -2416,7 +2444,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="net/sourceforge/jmatio"/>
+ <param name="project-path" value="org/tallison"/>
<param name="artifact-name" value="jmatio"/>
<param name="artifact-version" value="${jmatio.version}"/>
<param name="artifact-type" value="jar"/>
Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1784010&r1=1784009&r2=1784010&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Wed Feb 22 10:50:20 2017
@@ -34,7 +34,7 @@
<include name="zookeeper*.jar"/>
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
- <include name="commons-collections*.jar"/>
+ <include name="commons-collections-*.jar"/>
<include name="commons-el*.jar"/>
<include name="commons-fileupload*.jar"/>
<include name="httpcore*.jar"/>
@@ -86,6 +86,7 @@
<include name="jackson-annotations*.jar"/>
<include name="tika-parsers*.jar"/>
<include name="geoapi*.jar"/>
+ <include name="jsr-275*.jar"/>
<include name="sis-metadata*.jar"/>
<include name="sis-utility*.jar"/>
<include name="sis-netcdf*.jar"/>
@@ -99,6 +100,7 @@
<include name="netcdf4*.jar"/>
<include name="httpservices*.jar"/>
<include name="grib*.jar"/>
+ <include name="jna*.jar"/>
<include name="cdm*.jar"/>
<include name="udunits*.jar"/>
<include name="jcommander*.jar"/>
@@ -1393,6 +1395,7 @@
<include name="jackson-annotations*.jar"/>
<include name="tika-parsers*.jar"/>
<include name="geoapi*.jar"/>
+ <include name="jsr-275*.jar"/>
<include name="sis-metadata*.jar"/>
<include name="sis-utility*.jar"/>
<include name="sis-netcdf*.jar"/>
@@ -1406,6 +1409,8 @@
<include name="netcdf4*.jar"/>
<include name="httpservices*.jar"/>
<include name="grib*.jar"/>
+ <include name="jna*.jar"/>
+ <include name="jj2000*.jar"/>
<include name="cdm*.jar"/>
<include name="udunits*.jar"/>
<include name="jcommander*.jar"/>
Modified: manifoldcf/trunk/framework/connector-common/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/connector-common/pom.xml?rev=1784010&r1=1784009&r2=1784010&view=diff
==============================================================================
--- manifoldcf/trunk/framework/connector-common/pom.xml (original)
+++ manifoldcf/trunk/framework/connector-common/pom.xml Wed Feb 22 10:50:20 2017
@@ -83,11 +83,6 @@
<artifactId>tika-core</artifactId>
<version>${tika.version}</version>
</dependency>
- <!-- dependency>
- <groupId>org.codelibs</groupId>
- <artifactId>jhighlight</artifactId>
- <version>${jhighlight.version}</version>
- </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=1784010&r1=1784009&r2=1784010&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Wed Feb 22 10:50:20 2017
@@ -84,8 +84,7 @@
<zookeeper.version>3.4.8</zookeeper.version>
<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 -->
+ <tika.version>1.14</tika.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
<hadoop.version>2.6.0</hadoop.version>
<tomcat.version>6.0.35</tomcat.version>