Author: kwright
Date: Wed Oct 17 17:23:30 2018
New Revision: 1844137
URL: http://svn.apache.org/viewvc?rev=1844137&view=rev
Log:
Upgrade to Tika 1.19.1.
Modified:
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/alfresco-webscript/build.xml
manifoldcf/trunk/connectors/cmis/build.xml
manifoldcf/trunk/connectors/generic/build.xml
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1844137&r1=1844136&r2=1844137&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Wed Oct 17 17:23:30 2018
@@ -65,7 +65,10 @@
<property name="javamail-spec.version" value="1.7.1"/>
<property name="tomcat.version" value="6.0.35"/>
<property name="jaxb-api.version" value="2.3.0"/>
- <property name="jaxb-impl.version" value="2.3.0"/>
+ <property name="jaxb-glassfish.version" value="2.3.0.1"/>
+ <property name="istack-commons-runtime.version" value="3.0.5"/>
+ <property name="stax-ex.version" value="1.7.8"/>
+ <property name="fastinfoset.version" value="1.2.13"/>
<property name="jaxws.version" value="2.2.6"/>
<property name="solrj.version" value="7.4.0"/>
<property name="noggit.version" value="0.8"/>
@@ -111,7 +114,7 @@
<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.19"/>
+ <property name="tika.version" value="1.19.1"/>
<property name="tagsoup.version" value="1.2.1"/>
<property name="james.version" value="0.8.2"/>
<property name="vorbis.version" value="0.8"/>
@@ -147,7 +150,7 @@
<property name="xmpcore.version" value="5.1.3"/>
<property name="rome.version" value="1.5.1"/>
<property name="mp4parser.version" value="1.1.22"/>
- <property name="jmatio.version" value="1.4"/>
+ <property name="jmatio.version" value="1.5"/>
<property name="java-libpst.version" value="0.8.1"/>
<property name="commons-httpclient.version" value="3.1"/>
<property name="jackson-databind.version" value="2.9.6"/>
@@ -1540,9 +1543,39 @@ 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/sun/xml/bind"/>
- <param name="artifact-version" value="${jaxb-impl.version}"/>
- <param name="artifact-name" value="jaxb-impl"/>
+ <param name="project-path" value="org/glassfish/jaxb"/>
+ <param name="artifact-version" value="${jaxb-glassfish.version}"/>
+ <param name="artifact-name" value="jaxb-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/jaxb"/>
+ <param name="artifact-version" value="${jaxb-glassfish.version}"/>
+ <param name="artifact-name" value="jaxb-runtime"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/jaxb"/>
+ <param name="artifact-version" value="${jaxb-glassfish.version}"/>
+ <param name="artifact-name" value="txw2"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/sun/istack"/>
+ <param name="artifact-version"
value="${istack-commons-runtime.version}"/>
+ <param name="artifact-name" value="istack-commons-runtime"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/sun/xml/fastinfoset"/>
+ <param name="artifact-version" value="${fastinfoset.version}"/>
+ <param name="artifact-name" value="FastInfoset"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/jvnet/staxex"/>
+ <param name="artifact-version" value="${stax-ex.version}"/>
+ <param name="artifact-name" value="stax-ex"/>
<param name="artifact-type" value="jar"/>
</antcall>
</target>
Modified: manifoldcf/trunk/connectors/alfresco-webscript/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/build.xml?rev=1844137&r1=1844136&r2=1844137&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/build.xml Wed Oct 17
17:23:30 2018
@@ -45,7 +45,6 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxb*.jar"/>
<include name="jaxws*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
Modified: manifoldcf/trunk/connectors/cmis/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/build.xml?rev=1844137&r1=1844136&r2=1844137&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/build.xml (original)
+++ manifoldcf/trunk/connectors/cmis/build.xml Wed Oct 17 17:23:30 2018
@@ -60,7 +60,6 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxb*.jar"/>
<include name="jaxws*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
@@ -78,7 +77,6 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxb*.jar"/>
<include name="jaxws*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
Modified: manifoldcf/trunk/connectors/generic/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/generic/build.xml?rev=1844137&r1=1844136&r2=1844137&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/generic/build.xml (original)
+++ manifoldcf/trunk/connectors/generic/build.xml Wed Oct 17 17:23:30 2018
@@ -33,7 +33,6 @@
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
<fileset dir="${mcf-dist}/lib">
- <include name="jaxb-impl*.jar"/>
</fileset>
</path>
@@ -41,7 +40,6 @@
<mkdir dir="dist/lib"/>
<copy todir="dist/lib">
<fileset dir="${mcf-dist}/lib">
- <include name="jaxb-impl*.jar"/>
</fileset>
</copy>
</target>
Modified: manifoldcf/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1844137&r1=1844136&r2=1844137&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Wed Oct 17 17:23:30 2018
@@ -179,6 +179,11 @@
<include name="xmlschema-core*.jar"/>
<include name="javax.annotation-api*.jar"/>
<include name="javax.ws.rs-api*.jar"/>
+ <include name="jaxb*.jar"/>
+ <include name="txw2*.jar"/>
+ <include name="istack-commons-runtime*.jar"/>
+ <include name="FastInfoset*.jar"/>
+ <include name="stax-ex*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="castor*.jar"/>
@@ -1615,6 +1620,11 @@
<include name="xmlschema-core*.jar"/>
<include name="javax.annotation-api*.jar"/>
<include name="javax.ws.rs-api*.jar"/>
+ <include name="jaxb*.jar"/>
+ <include name="txw2*.jar"/>
+ <include name="istack-commons-runtime*.jar"/>
+ <include name="FastInfoset*.jar"/>
+ <include name="stax-ex*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="castor*.jar"/>
Modified: manifoldcf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1844137&r1=1844136&r2=1844137&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Wed Oct 17 17:23:30 2018
@@ -84,7 +84,7 @@
<zookeeper.version>3.4.10</zookeeper.version>
<xmlbeans.version>2.6.0</xmlbeans.version>
<poi.version>3.17</poi.version>
- <tika.version>1.19</tika.version>
+ <tika.version>1.19.1</tika.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
<hadoop.version>2.6.0</hadoop.version>
<tomcat.version>6.0.35</tomcat.version>
