Author: kwright
Date: Thu Feb 24 23:44:39 2022
New Revision: 1898402
URL: http://svn.apache.org/viewvc?rev=1898402&view=rev
Log:
Update to tika 1.28.1, which requires updates across the stack. Followup
changes should be expected.
Modified:
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/csws/pom.xml
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1898402&r1=1898401&r2=1898402&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Thu Feb 24 23:44:39 2022
@@ -32,34 +32,33 @@
<property name="javax-activation.version" value="1.2.0"/>
<property name="hsqldb.version" value="2.3.2"/>
<property name="jetty.version" value="9.4.25.v20191220"/>
- <property name="httpclient.version" value="4.5.8"/>
- <property name="httpmime.version" value="4.5.8"/>
- <property name="httpcore.version" value="4.4.10"/>
+ <property name="httpclient.version" value="4.5.13"/>
+ <property name="httpmime.version" value="4.5.13"/>
+ <property name="httpcore.version" value="4.4.15"/>
<property name="xerces.version" value="2.10.0"/>
<property name="zookeeper.version" value="3.4.10"/>
<property name="mongodb.version" value="2.11.3"/>
<property name="postgresql.version" value="42.1.3"/>
<property name="axis.version" value="1.4"/>
<property name="saaj-api.version" value="1.3"/>
- <property name="saaj-impl.version" value="1.3.3"/>
+ <property name="saaj-impl.version" value="1.5.1"/>
<property name="castor.version" value="1.0.5"/>
<property name="wsdl4j.version" value="1.6.2"/>
<property name="commons-codec.version" value="1.10"/>
<property name="commons-collections.version" value="3.2.2"/>
- <property name="commons-collections4.version" value="4.2"/>
+ <property name="commons-collections4.version" value="4.4"/>
<property name="commons-discovery.version" value="0.5"/>
<property name="commons-el.version" value="1.0"/>
<property name="commons-fileupload.version" value="1.3.3"/>
- <property name="commons-io.version" value="2.5"/>
+ <property name="commons-io.version" value="2.11.0"/>
<property name="commons-lang.version" value="2.6"/>
- <property name="commons-lang3.version" value="3.9"/>
+ <property name="commons-lang3.version" value="3.12.0"/>
<property name="commons-logging.version" value="1.2"/>
<property name="commons-configuration.version" value="1.6"/>
<property name="commons-cli.version" value="1.2"/>
- <property name="slf4j.version" value="1.7.25"/>
+ <property name="slf4j.version" value="1.7.36"/>
<property name="xalan.version" value="2.7.1"/>
- <property name="poi.version" value="4.0.1"/>
- <property name="activation.version" value="1.1.1"/>
+ <property name="poi.version" value="4.1.2"/>
<property name="avalon.version" value="4.3.1"/>
<property name="ecj.version" value="4.3.1"/>
<property name="fop.version" value="1.0"/>
@@ -67,14 +66,23 @@
<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.2"/>
+ <property name="jaxb-glassfish.version" value="2.3.5"/>
<property name="sun-bind.version" value="2.3.2"/>
<property name="dtd-parser.version" value="1.4.1"/>
- <property name="istack-commons.version" value="3.0.8"/>
+ <property name="istack-commons.version" value="3.0.12"/>
<property name="ant-jar.version" value="1.10.5"/>
<property name="stax-ex.version" value="1.8.1"/>
<property name="fastinfoset.version" value="1.2.16"/>
- <property name="jaxws.version" value="2.2.6"/>
+ <property name="jaxws.version" value="2.3.2"/>
+ <property name="jakarta.activation.version" value="1.2.2"/>
+ <property name="jakarta.activation-api.version" value="1.2.1"/>
+ <property name="jakarta.ws.rs-api.version" value="2.1.6"/>
+ <property name="jakarta.xml.bind-api.version" value = "2.3.2"/>
+ <property name="jakarta.xml.ws-api.version" value="2.3.2"/>
+ <property name="jakarta.xml.soap-api.version" value="1.4.1"/>
+ <property name="jakarta.annotation-api.version" value="1.3.4"/>
+ <property name="jakarta.jws-api.version" value="1.1.1"/>
+ <property name="ha-api.version" value="3.1.12"/>
<property name="solrj.version" value="8.3.1"/>
<property name="noggit.version" value="0.8"/>
<property name="commons-math3.version" value="3.6.1"/>
@@ -86,19 +94,19 @@
<property name="log4j12.version" value="1.2.17"/>
<property name="log4j.version" value="2.17.0"/>
<property name="mail.version" value="1.6.2"/>
- <property name="mimepull.version" value="1.3"/>
+ <property name="mimepull.version" value="1.9.11"/>
<property name="opensaml.version" value="1.1"/>
<property name="osgi.version" value="5.0.0"/>
<property name="xml-resolver.version" value="1.2"/>
<property name="servlet-api.version" value="3.1.0"/>
<property name="stax-api.version" value="1.0.1"/>
- <property name="stax-ex.version" value="1.2"/>
- <property name="streambuffer.version" value="0.9"/>
+ <property name="streambuffer.version" value="1.5.7"/>
<property name="velocity.version" value="1.7"/>
+ <property name="velocity-engine-core.version" value="2.3"/>
<property name="wss4j.version" value="1.5.12"/>
<property name="xmlgraphics-commons.version" value="1.4"/>
<property name="woodstox-core-asl.version" value="4.4.0"/>
- <property name="woodstox-core.version" value="5.1.0"/>
+ <property name="woodstox-core.version" value="6.2.8"/>
<property name="stax2-api.version" value="4.1"/>
<property name="xmlsec.version" value="1.4.0"/>
<property name="xml-apis.version" value="1.4.01"/>
@@ -110,7 +118,7 @@
<property name="google-http-client.version" value="1.25.0"/>
<property name="findbugs.version" value="3.0.2"/>
<property name="j2objc.version" value="1.1"/>
- <property name="jackson-core.version" value="2.9.8"/>
+ <property name="jackson-core.version" value="2.13.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"/>
@@ -121,57 +129,61 @@
<property name="objenesis.version" value="2.1"/>
<property name="tika.version" value="1.21"/>
<property name="tagsoup.version" value="1.2.1"/>
- <property name="james.version" value="0.8.3"/>
+ <property name="james.version" value="0.8.4"/>
<property name="vorbis.version" value="0.8"/>
- <property name="metadata-extractor.version" value="2.11.0"/>
<property name="aspectjrt.version" value="1.8.6"/>
<property name="jhighlight.version" value="1.0.3"/>
- <property name="xmlbeans.version" value="3.0.1"/>
- <property name="bc.version" value="1.61"/>
- <property name="tukaani.version" value="1.8"/>
- <property name="parso.version" value="2.0.11"/>
+ <property name="xmlbeans.version" value="3.1.0"/>
+ <property name="bc.version" value="1.70"/>
+ <property name="SparseBitSet.version" value="1.2"/>
+ <property name="HikariCP-java7.version" value="2.4.13"/>
+ <property name="tukaani.version" value="1.9"/>
+ <property name="parso.version" value="2.0.14"/>
<property name="dec.version" value="0.1.2"/>
- <property name="pdfbox.version" value="2.0.15"/>
+ <property name="pdfbox.version" value="2.0.25"/>
<property name="jempbox.version" value="1.8.16"/>
- <property name="commons-compress.version" value="1.18"/>
- <property name="commons-csv.version" value="1.6"/>
+ <property name="commons-compress.version" value="1.21"/>
+ <property name="commons-csv.version" value="1.9.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="jna.version" value="5.3.1"/>
+ <property name="jna.version" value="5.10.0"/>
<property name="cglib.version" value="3.2.4"/>
- <property name="jcommander.version" value="1.35"/>
- <property name="protobuf.version" value="3.7.1"/>
+ <property name="jcommander.version" value="1.82"/>
+ <property name="protobuf.version" value="3.19.4"/>
<property name="jcip-annotations.version" value="1.0"/>
<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="jbig2-imageio.version" value="3.0.2"/>
+ <property name="jdom2.version" value="2.0.6.1"/>
+ <property name="jbig2-imageio.version" value="3.0.3"/>
<property name="jai-imageio.version" value="1.4.0"/>
- <property name="quartz.version" value="2.2.0"/>
+ <property name="quartz.version" value="2.3.2"/>
<property name="boilerpipe.version" value="1.1.0"/>
<property name="dom4j.version" value="1.6.1"/>
- <property name="asm.version" value="7.1"/>
- <property name="xmpcore.version" value="5.1.3"/>
- <property name="rome.version" value="1.12.0"/>
- <property name="mp4parser.version" value="1.1.22"/>
+ <property name="asm.version" value="9.2"/>
+ <property name="xmpcore.version" value="6.1.11"/>
+ <property name="mchange-commons-java.version" value="0.2.19"/>
+ <property name="dd-plist.version" value="1.23"/>
+ <property name="rome.version" value="1.18.0"/>
<property name="jmatio.version" value="1.5"/>
- <property name="java-libpst.version" value="0.8.1"/>
+ <property name="metadata-extractor.version" value="2.15.0.1"/>
+ <property name="isoparser.version" value="1.9.41.7"/>
+ <property name="java-libpst.version" value="0.9.3"/>
<property name="commons-httpclient.version" value="3.1"/>
- <property name="jackson-databind.version" value="2.9.8"/>
- <property name="jackson-annotations.version" value="2.9.8"/>
+ <property name="jackson-databind.version" value="2.13.1"/>
+ <property name="jackson-annotations.version" value="2.13.1"/>
<property name="resteasy.client.version" value="3.0.16.Final"/>
<property name="jsoup.version" value="1.11.3"/>
<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.9.7"/>
- <property name="junrar.version" value="4.0.0"/>
- <property name="jackcess.version" value="3.0.1"/>
- <property name="jackcess-encrypt.version" value="3.0.0"/>
- <property name="opennlp.version" value="1.9.0"/>
- <property name="openjson.version" value="1.0.10"/>
- <property name="sis.version" value="0.8"/>
+ <property name="junrar.version" value="7.4.1"/>
+ <property name="jackcess.version" value="4.0.1"/>
+ <property name="jackcess-encrypt.version" value="4.0.1"/>
+ <property name="opennlp.version" value="1.9.4"/>
+ <property name="openjson.version" value="1.0.12"/>
+ <property name="sis.version" value="1.1"/>
<property name="measure.version" value="1.0"/>
<property name="opengis.version" value="3.0.1"/>
<property name="jsr-275.version" value="0.9.3"/>
@@ -179,16 +191,19 @@
<property name="maven-scm.version" value="1.4"/>
<property name="plexus-utils.version" value="1.5.6"/>
<property name="regexp.version" value="1.3"/>
- <property name="c3p0.version" value="0.9.1.1"/>
+ <property name="c3p0.version" value="0.9.5.5"/>
<property name="sentiment-analysis.version" value="0.1"/>
<property name="uimafit.version" value="2.2.0"/>
<property name="uimaj.version" value="2.9.0"/>
- <property name="cxf.version" value="3.3.1"/>
+ <property name="cxf.version" value="3.5.0"/>
+ <property name="policy.version" value="2.7.6"/>
+ <property name="gmbal.version" value="4.0.0"/>
+ <property name="management-api.version" value="3.2.1"/>
+ <property name="pfl.version" value="4.0.1"/>
<property name="neethi.version" value="3.0.3"/>
- <property name="xmlschema.version" value="2.2.4"/>
- <property name="annotation-api.version" value="1.3.2"/>
- <property name="javax.ws.rs-api.version" value="2.1"/>
- <property name="virtuald.version" value="1.05"/>
+ <property name="xmlschema.version" value="2.3.0"/>
+ <property name="annotation-api.version" value="1.3.5"/>
+ <property name="virtuald.version" value="1.06"/>
<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" />
@@ -1038,13 +1053,6 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="javax.activation"/>
<param name="artifact-type" value="jar"/>
</antcall>
- <antcall target="download-via-maven">
- <param name="project-path" value="javax/jws"/>
- <param name="artifact-version" value="1.1"/>
- <param name="target" value="lib"/>
- <param name="artifact-name" value="javax.jws-api"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
</target>
<target name="download-hsqldb">
@@ -1495,16 +1503,6 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="download-activation">
- <mkdir dir="lib"/>
- <antcall target="download-via-maven"><param name="target" value="lib"/>
- <param name="project-path" value="javax/activation"/>
- <param name="artifact-version" value="${activation.version}"/>
- <param name="artifact-name" value="activation"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- </target>
-
<target name="download-avalon-framework">
<property name="avalon.path" value="org/apache/avalon/framework"/>
<mkdir dir="lib"/>
@@ -1682,26 +1680,70 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="FastInfoset"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ </target>
+
+ <target name="download-jaxws">
+ <mkdir dir="lib"/>
<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="project-path" value="com/sun/xml/ws"/>
+ <param name="artifact-version" value="${jaxws.version}"/>
+ <param name="artifact-name" value="jaxws-rt"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="download-jakarta-runtimes">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/sun/activation"/>
+ <param name="artifact-name" value="jakarta.activation"/>
+ <param name="artifact-version"
value="${jakarta.activation.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
</target>
- <target name="download-jaxws">
+ <target name="download-jakarta-apis">
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
- <param name="project-path" value="javax/xml/ws"/>
- <param name="artifact-version" value="${jaxws.version}"/>
- <param name="artifact-name" value="jaxws-api"/>
+ <param name="project-path" value="jakarta/activation"/>
+ <param name="artifact-name" value="jakarta.activation-api"/>
+ <param name="artifact-version"
value="${jakarta.activation-api.version}"/>
<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/ws"/>
- <param name="artifact-version" value="${jaxws.version}"/>
- <param name="artifact-name" value="jaxws-rt"/>
+ <param name="project-path" value="jakarta/ws/rs"/>
+ <param name="artifact-name" value="jakarta.ws.rs-api"/>
+ <param name="artifact-version"
value="${jakarta.ws.rs-api.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="jakarta/xml/bind"/>
+ <param name="artifact-version"
value="${jakarta.xml.bind-api.version}"/>
+ <param name="artifact-name" value="jakarta.xml.bind-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="jakarta/xml/ws"/>
+ <param name="artifact-version"
value="${jakarta.xml.ws-api.version}"/>
+ <param name="artifact-name" value="jakarta.xml.ws-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="jakarta/xml/soap"/>
+ <param name="artifact-version"
value="${jakarta.xml.soap-api.version}"/>
+ <param name="artifact-name" value="jakarta.xml.soap-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="jakarta/annotation"/>
+ <param name="artifact-version"
value="${jakarta.annotation-api.version}"/>
+ <param name="artifact-name" value="jakarta.annotation-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="jakarta/jws"/>
+ <param name="artifact-version" value="${jakarta.jws-api.version}"/>
+ <param name="artifact-name" value="jakarta.jws-api"/>
<param name="artifact-type" value="jar"/>
</antcall>
</target>
@@ -1918,7 +1960,7 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-mimepull">
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
- <param name="project-path" value="org/jvnet"/>
+ <param name="project-path" value="org/jvnet/mimepull"/>
<param name="artifact-version" value="${mimepull.version}"/>
<param name="artifact-name" value="mimepull"/>
<param name="artifact-type" value="jar"/>
@@ -1991,6 +2033,16 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
+ <target name="download-ha-api">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/ha"/>
+ <param name="artifact-version" value="${ha-api.version}"/>
+ <param name="artifact-name" value="ha-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-velocity">
<mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
@@ -1999,6 +2051,12 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="velocity"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/velocity"/>
+ <param name="artifact-version"
value="${velocity-engine-core.version}"/>
+ <param name="artifact-name" value="velocity-engine-core"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-wss4j">
@@ -2420,7 +2478,79 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="download-cxf"
depends="download-xml-resolver,download-asm,download-jaxb">
+ <target name="download-policy">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/sun/xml/ws"/>
+ <param name="artifact-name" value="policy"/>
+ <param name="artifact-version" value="${policy.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="download-management-api">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/external"/>
+ <param name="artifact-name" value="management-api"/>
+ <param name="artifact-version" value="${management-api.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="download-pfl">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/pfl"/>
+ <param name="artifact-name" value="pfl-basic"/>
+ <param name="artifact-version" value="${pfl.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/pfl"/>
+ <param name="artifact-name" value="pfl-tf"/>
+ <param name="artifact-version" value="${pfl.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/pfl"/>
+ <param name="artifact-name" value="pfl-asm"/>
+ <param name="artifact-version" value="${pfl.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/pfl"/>
+ <param name="artifact-name" value="pfl-dynamic"/>
+ <param name="artifact-version" value="${pfl.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/pfl"/>
+ <param name="artifact-name" value="pfl-basic-tools"/>
+ <param name="artifact-version" value="${pfl.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/pfl"/>
+ <param name="artifact-name" value="pfl-tf-tools"/>
+ <param name="artifact-version" value="${pfl.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+
+ </target>
+
+ <target name="download-gmbal"
depends="download-management-api,download-pfl">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/glassfish/gmbal"/>
+ <param name="artifact-name" value="gmbal"/>
+ <param name="artifact-version" value="${gmbal.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
+ <target name="download-cxf"
depends="download-jakarta-apis,download-policy,download-gmbal,download-stax,download-xml-resolver,download-asm,download-jaxb,download-ha-api,download-saaj">
+ <mkdir dir="lib"/>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/apache/cxf"/>
<param name="artifact-name" value="cxf-rt-transports-http-hc"/>
@@ -2558,7 +2688,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="c3p0"/>
+ <param name="project-path" value="com/mchange"/>
<param name="artifact-version" value="${c3p0.version}"/>
<param name="artifact-name" value="c3p0"/>
<param name="artifact-type" value="jar"/>
@@ -2660,6 +2790,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/sis/core"/>
+ <param name="artifact-version" value="${sis.version}"/>
+ <param name="artifact-name" value="sis-feature"/>
+ <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/storage"/>
<param name="artifact-version" value="${sis.version}"/>
<param name="artifact-name" value="sis-netcdf"/>
@@ -2816,12 +2952,6 @@ 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/drewnoakes"/>
- <param name="artifact-name" value="metadata-extractor"/>
- <param name="artifact-version"
value="${metadata-extractor.version}"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/aspectj"/>
<param name="artifact-name" value="aspectjrt"/>
<param name="artifact-version" value="${aspectjrt.version}"/>
@@ -2847,6 +2977,12 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/bouncycastle"/>
+ <param name="artifact-name" value="bcutil-jdk15on"/>
+ <param name="artifact-version" value="${bc.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/bouncycastle"/>
<param name="artifact-name" value="bcprov-jdk15on"/>
<param name="artifact-version" value="${bc.version}"/>
<param name="artifact-type" value="jar"/>
@@ -2858,6 +2994,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="com/zaxxer"/>
+ <param name="artifact-name" value="SparseBitSet"/>
+ <param name="artifact-version" value="${SparseBitSet.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/zaxxer"/>
+ <param name="artifact-name" value="HikariCP-java7"/>
+ <param name="artifact-version" value="${HikariCP-java7.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/tukaani"/>
<param name="artifact-name" value="xz"/>
<param name="artifact-version" value="${tukaani.version}"/>
@@ -2895,6 +3043,18 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/apache/pdfbox"/>
+ <param name="artifact-name" value="preflight"/>
+ <param name="artifact-version" value="${pdfbox.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/pdfbox"/>
+ <param name="artifact-name" value="xmpbox"/>
+ <param name="artifact-version" value="${pdfbox.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/pdfbox"/>
<param name="artifact-name" value="pdfbox-debugger"/>
<param name="artifact-version" value="${pdfbox.version}"/>
<param name="artifact-type" value="jar"/>
@@ -2930,12 +3090,24 @@ 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/adobe/xmp"/>
- <param name="artifact-name" value="xmpcore"/>
+ <param name="project-path" value="org/tallison/xmp"/>
+ <param name="artifact-name" value="xmpcore-shaded"/>
<param name="artifact-version" value="${xmpcore.version}"/>
<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="artifact-name" value="mchange-commons-java"/>
+ <param name="artifact-version"
value="${mchange-commons-java.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/googlecode/plist"/>
+ <param name="artifact-name" value="dd-plist"/>
+ <param name="artifact-version" value="${dd-plist.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/gagravarr"/>
<param name="artifact-name" value="vorbis-java-core"/>
<param name="artifact-version" value="${vorbis.version}"/>
@@ -2972,9 +3144,9 @@ 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/googlecode/mp4parser"/>
- <param name="artifact-name" value="isoparser"/>
- <param name="artifact-version" value="${mp4parser.version}"/>
+ <param name="project-path" value="org/apache/cxf"/>
+ <param name="artifact-name" value="cxf-rt-security"/>
+ <param name="artifact-version" value="${cxf.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
@@ -3008,21 +3180,27 @@ 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/annotation"/>
- <param name="artifact-name" value="javax.annotation-api"/>
+ <param name="project-path" value="jakarta/annotation"/>
+ <param name="artifact-name" value="jakarta.annotation-api"/>
<param name="artifact-version" value="${annotation-api.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
- <param name="project-path" value="javax/ws/rs"/>
- <param name="artifact-name" value="javax.ws.rs-api"/>
- <param name="artifact-version" value="${javax.ws.rs-api.version}"/>
+ <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"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/tallison"/>
+ <param name="artifact-name" value="metadata-extractor"/>
+ <param name="artifact-version"
value="${metadata-extractor.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/tallison"/>
- <param name="artifact-name" value="jmatio"/>
- <param name="artifact-version" value="${jmatio.version}"/>
+ <param name="artifact-name" value="isoparser"/>
+ <param name="artifact-version" value="${isoparser.version}"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
@@ -3066,7 +3244,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps"
depends="download-less-compiler,download-forbidden-checks,download-nuxeo-client,download-json-simple,download-selenium,download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-jdk11-materials,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download
-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps"
depends="download-jakarta-apis,download-jakarta-runtimes,download-less-compiler,download-forbidden-checks,download-nuxeo-client,download-json-simple,download-selenium,download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-jdk11-materials,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-ha-api,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,downloa
d-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/trunk/connectors/csws/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/csws/pom.xml?rev=1898402&r1=1898401&r2=1898402&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/csws/pom.xml (original)
+++ manifoldcf/trunk/connectors/csws/pom.xml Thu Feb 24 23:44:39 2022
@@ -238,6 +238,11 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcomponent.httpclient.version}</version>
Modified: manifoldcf/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1898402&r1=1898401&r2=1898402&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Thu Feb 24 23:44:39 2022
@@ -120,6 +120,7 @@
<include name="sis-utility*.jar"/>
<include name="sis-netcdf*.jar"/>
<include name="sis-storage*.jar"/>
+ <include name="sis-feature*.jar"/>
<include name="unit-api*.jar"/>
<include name="opennlp-tools*.jar"/>
<include name="openjson*.jar"/>
@@ -155,15 +156,21 @@
<include name="pdfbox*.jar"/>
<include name="fontbox*.jar"/>
<include name="jempbox*.jar"/>
+ <include name="xmpbox*.jar"/>
+ <include name="preflight*.jar"/>
<include name="bcmail-jdk15on*.jar"/>
+ <include name="bcutil-jdk15on*.jar"/>
<include name="bcprov-jdk15on*.jar"/>
<include name="bcpkix-jdk15on*.jar"/>
+ <include name="SparseBitSet*.jar"/>
+ <include name="HikariCP-java7*.jar"/>
<include name="geronimo-stax-api_1.0_spec*.jar"/>
<include name="asm*.jar"/>
<include name="isoparser*.jar"/>
<include name="aspectjrt*.jar"/>
- <include name="metadata-extractor*.jar"/>
<include name="xmpcore*.jar"/>
+ <include name="mchange-commons-java*.jar"/>
+ <include name="dd-plist*.jar"/>
<include name="xml-apis*.jar"/>
<include name="boilerpipe*.jar"/>
<include name="rome*.jar"/>
@@ -173,16 +180,22 @@
<include name="juniversalchardet*.jar"/>
<include name="jhighlight*.jar"/>
<include name="jmatio*.jar"/>
+ <include name="metadata-extractor*.jar"/>
<include name="java-libpst*.jar"/>
<include name="xz*.jar"/>
<include name="parso*.jar"/>
<include name="dec*.jar"/>
<include name="cxf-*.jar"/>
+ <include name="policy*.jar"/>
+ <include name="gmbal*.jar"/>
+ <include name="pfl-*.jar"/>
+ <include name="management-api*.jar"/>
+ <include name="stax-ex*.jar"/>
+ <include name="ha-api*.jar"/>
<include name="neethi*.jar"/>
<include name="xml-resolver*.jar"/>
<include name="xmlschema-core*.jar"/>
- <include name="javax.annotation-api*.jar"/>
- <include name="javax.ws.rs-api*.jar"/>
+ <include name="jakarta.*.jar"/>
<include name="jaxb*.jar"/>
<include name="xsom*.jar"/>
<include name="codemodel*.jar"/>
@@ -193,7 +206,7 @@
<include name="txw2*.jar"/>
<include name="istack-commons*.jar"/>
<include name="FastInfoset*.jar"/>
- <include name="stax-ex*.jar"/>
+ <include name="velocity-engine-core*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="castor*.jar"/>
@@ -205,7 +218,7 @@
<include name="wsdl4j*.jar"/>
<include name="xmlsec*.jar"/>
<include name="opensaml*.jar"/>
- <include name="activation*.jar"/>
+ <!--include name="activation*.jar"/-->
</fileset>
</path>
@@ -1599,6 +1612,7 @@
<include name="sis-utility*.jar"/>
<include name="sis-netcdf*.jar"/>
<include name="sis-storage*.jar"/>
+ <include name="sis-feature*.jar"/>
<include name="unit-api*.jar"/>
<include name="opennlp-tools*.jar"/>
<include name="openjson*.jar"/>
@@ -1638,17 +1652,23 @@
<include name="pdfbox*.jar"/>
<include name="fontbox*.jar"/>
<include name="jempbox*.jar"/>
+ <include name="xmpbox*.jar"/>
+ <include name="preflight*.jar"/>
<include name="kafka*.jar"/>
<include name="zookeeper*.jar"/>
<include name="bcmail-jdk15*.jar"/>
+ <include name="bcutil-jdk15*.jar"/>
<include name="bcprov-jdk15*.jar"/>
<include name="bcpkix-jdk15*.jar"/>
+ <include name="SparseBitSet*.jar"/>
+ <include name="HikariCP-java7*.jar"/>
<include name="geronimo-stax-api_1.0_spec*.jar"/>
<include name="asm*.jar"/>
<include name="isoparser*.jar"/>
<include name="aspectjrt*.jar"/>
- <include name="metadata-extractor*.jar"/>
<include name="xmpcore*.jar"/>
+ <include name="mchange-commons-java*.jar"/>
+ <include name="dd-plist*.jar"/>
<include name="xml-apis*.jar"/>
<include name="boilerpipe*.jar"/>
<include name="rome*.jar"/>
@@ -1658,16 +1678,22 @@
<include name="juniversalchardet*.jar"/>
<include name="jhighlight*.jar"/>
<include name="jmatio*.jar"/>
+ <include name="metadata-extractor*.jar"/>
<include name="java-libpst*.jar"/>
<include name="xz*.jar"/>
<include name="parso*.jar"/>
<include name="dec*.jar"/>
<include name="cxf-*.jar"/>
+ <include name="policy*.jar"/>
+ <include name="gmbal*.jar"/>
+ <include name="pfl-*.jar"/>
+ <include name="management-api*.jar"/>
+ <include name="stax-ex*.jar"/>
+ <include name="ha-api*.jar"/>
<include name="neethi*.jar"/>
<include name="xml-resolver*.jar"/>
<include name="xmlschema-core*.jar"/>
- <include name="javax.annotation-api*.jar"/>
- <include name="javax.ws.rs-api*.jar"/>
+ <include name="jakarta.*.jar"/>
<include name="jaxb*.jar"/>
<include name="xsom*.jar"/>
<include name="codemodel*.jar"/>
@@ -1678,7 +1704,7 @@
<include name="txw2*.jar"/>
<include name="istack-commons*.jar"/>
<include name="FastInfoset*.jar"/>
- <include name="stax-ex*.jar"/>
+ <include name="velocity-engine-core*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="castor*.jar"/>
@@ -1690,11 +1716,7 @@
<include name="wsdl4j*.jar"/>
<include name="xmlsec*.jar"/>
<include name="opensaml*.jar"/>
- <include name="activation*.jar"/>
- </fileset>
- <fileset dir="../lib">
- <include name="jaxws-api*.jar"/>
- <include name="javax.jws-api*.jar"/>
+ <!--include name="activation*.jar"/-->
</fileset>
</copy>
</target>
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1898402&r1=1898401&r2=1898402&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Thu Feb 24
23:44:39 2022
@@ -227,8 +227,8 @@
<include name="cxf-rt-transports-http*.jar"/>
<include name="cxf-rt-rs-client*.jar"/>
<include name="xmlschema-core*.jar"/>
- <include name="javax.annotation-api*.jar"/>
- <include name="javax.ws.rs-api*.jar"/>
+ <include name="jakarta.annotation-api*.jar"/>
+ <include name="jakarta.ws.rs-api*.jar"/>
</fileset>
<fileset dir="${mcf-dist}/connector-common-lib">
<include name="axis*.jar"/>
@@ -427,6 +427,7 @@
</fileset>
<fileset dir="${mcf-dist}/connector-common-lib">
<include name="cxf*.jar"/>
+ <include name="pfl*.jar"/>
<include name="jaxb*.jar"/>
<include name="wsdl4j*.jar"/>
<include name="woodstox*.jar"/>
@@ -434,12 +435,20 @@
<include name="xmlschema*.jar"/>
<include name="neethi*.jar"/>
<include name="xml-resolver*.jar"/>
+ <include name="codemodel*.jar"/>
+ <include name="xsom*.jar"/>
+ <include name="relaxng-datatype*.jar"/>
+ <include name="rngom*.jar"/>
+ <include name="dtd-parser*.jar"/>
+ <include name="istack-commons-tools*.jar"/>
+ <include name="velocity-engine-core*.jar"/>
</fileset>
<fileset dir="${mcf-dist}/lib">
<include name="velocity*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-lang*.jar"/>
<include name="javax.activation*.jar"/>
+ <include name="slf4j*.jar"/>
</fileset>
</classpath>
<jvmarg value="-Dorg.apache.cxf.stax.allowInsecureParser=1"/>
Modified: manifoldcf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1898402&r1=1898401&r2=1898402&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Thu Feb 24 23:44:39 2022
@@ -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.21</tika.version>
+ <tika.version>1.28.1</tika.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
<hadoop.version>2.6.0</hadoop.version>
<tomcat.version>6.0.35</tomcat.version>
@@ -95,7 +95,7 @@
<gson.version>2.8.0</gson.version>
<guava.version>21.0</guava.version>
<jsoup.version>1.7.2</jsoup.version>
- <cxf.version>3.3.1</cxf.version>
+ <cxf.version>3.5.0</cxf.version>
<jaxws-ri.version>2.3.2</jaxws-ri.version>
</properties>
