manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1702242 - in /manifoldcf/trunk: ./ CHANGES.txt build.xml dist-license/LICENSE.txt framework/build.xml lib-license/LICENSE.txt pom.xml
Date Thu, 10 Sep 2015 13:00:34 GMT
Author: kwright
Date: Thu Sep 10 13:00:34 2015
New Revision: 1702242

URL: http://svn.apache.org/r1702242
Log:
Fix for CONNECTORS-1236.

Modified:
    manifoldcf/trunk/   (props changed)
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/dist-license/LICENSE.txt
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/lib-license/LICENSE.txt
    manifoldcf/trunk/pom.xml

Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 10 13:00:34 2015
@@ -57,6 +57,7 @@
 /manifoldcf/branches/CONNECTORS-120-1:1416450-1417056
 /manifoldcf/branches/CONNECTORS-1204:1682204-1682409
 /manifoldcf/branches/CONNECTORS-1233:1697988-1701871
+/manifoldcf/branches/CONNECTORS-1236:1702132-1702240
 /manifoldcf/branches/CONNECTORS-13:1525862-1527182,1539324-1541634
 /manifoldcf/branches/CONNECTORS-470:1349741-1360750,1360808
 /manifoldcf/branches/CONNECTORS-474:1349741-1353803

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1702242&r1=1702241&r2=1702242&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Sep 10 13:00:34 2015
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.3-dev =====================
 
+CONNECTORS-1236: Upgrade to Tika 1.10.
+(Karl Wright)
+
 CONNECTORS-1233: Add Amazon S3 connector.
 (Gunaratnam Kuhajeyan, Karl Wright)
 

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1702242&r1=1702241&r2=1702242&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Thu Sep 10 13:00:34 2015
@@ -44,7 +44,7 @@
     <property name="saaj-impl.version" value="1.3.3"/>
     <property name="castor.version" value="1.0.5"/>
     <property name="wsdl4j.version" value="1.6.2"/>
-    <property name="commons-codec.version" value="1.9"/>
+    <property name="commons-codec.version" value="1.10"/>
     <property name="commons-collections.version" value="3.2.1"/>
     <property name="commons-discovery.version" value="0.5"/>
     <property name="commons-el.version" value="1.0"/>
@@ -56,7 +56,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.11"/>
+    <property name="poi.version" value="3.13-beta1"/>
     <property name="activation.version" value="1.1.1"/>
     <property name="avalon.version" value="4.3.1"/>
     <property name="ecj.version" value="4.3.1"/>
@@ -73,7 +73,7 @@
     <property name="mail.version" value="1.4.5"/>
     <property name="mimepull.version" value="1.3"/>
     <property name="opensaml.version" value="1.1"/>
-    <property name="osgi.version" value="1.0.0"/>
+    <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"/>
@@ -88,7 +88,7 @@
     <property name="xml-apis.version" value="1.4.01"/>
     <property name="jstl.version" value="1.2"/>
     <property name="dropbox-client.version" value="1.5.3"/>
-    <property name="json-simple.version" value="1.1"/>
+    <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.1.3"/>
@@ -96,31 +96,40 @@
     <property name="jetty-schemas.version" value="3.1.M0"/>
     <property name="alfresco-indexer.version" value="0.7.0"/>
     <property name="gson.version" value="2.2.4"/>
-    <property name="guava.version" value="15.0"/>
+    <property name="guava.version" value="18.0"/>
     <property name="mockito.version" value="1.9.5"/>
     <property name="wiremock.version" value="1.34"/>
     <property name="objenesis.version" value="2.1"/>
-    <property name="tika.version" value="1.7"/>
+    <property name="tika.version" value="1.10"/>
     <property name="tagsoup.version" value="1.2.1"/>
     <property name="james.version" value="0.7.2"/>
     <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="metadata-extractor.version" value="2.8.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.45"/>
+    <property name="bc.version" value="1.52"/>
     <property name="tukaani.version" value="1.5"/>
-    <property name="pdfbox.version" value="1.8.8"/>
-    <property name="commons-compress.version" value="1.8.1"/>
+    <property name="pdfbox.version" value="1.8.10"/>
+    <property name="commons-compress.version" value="1.10"/>
+    <property name="commons-csv.version" value="1.2"/>
+    <property name="commons-exec.version" value="1.3"/>
     <property name="juniversalchardet.version" value="1.0.3"/>
-    <property name="netcdf.version" value="4.2.20"/>
+    <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="jcip-annotations.version" value="1.0"/>
+    <property name="ehcache.version" value="2.6.11"/>
+    <property name="bzip2.version" value="0.9.1"/>
+    <property name="jdom2.version" value="2.0.4"/>
+    <property name="quartz.version" value="2.2.1"/>
     <property name="boilerpipe.version" value="1.1.0"/>
     <property name="dom4j.version" value="1.6.1"/>
     <property name="asm.version" value="4.1"/>
     <property name="xmpcore.version" value="5.1.2"/>
     <property name="jdom.version" value="1.0"/>
     <property name="rome.version" value="1.0"/>
-    <property name="mp4parser.version" value="1.0.2"/>
+    <property name="mp4parser.version" value="1.1.5"/>
     <property name="jmatio.version" value="1.0"/>
     <property name="java-libpst.version" value="0.8.1"/>
     <property name="commons-httpclient.version" value="3.1"/>
@@ -131,7 +140,16 @@
     <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="junrar.version" value="0.7"/>
+    <property name="jackcess.version" value="2.1.2"/>
+    <property name="jackcess-encrypt.version" value="2.1.0"/>
+    <property name="opennlp.version" value="1.6.0"/>
+    <property name="sis.version" value="0.5"/>
+    <property name="opengis.version" value="3.0.0"/>
+    <property name="javaee-api.version" value="6.0"/>
+    <property name="commons-vfs2.version" value="2.0"/>
+    <property name="c3p0.version" value="0.9.5.1"/>
+    
     <target name="downloaded-condition">
         <!-- Spot check a few of the dependent jars; no point including ALL of them here... -->
         <available file="lib/hsqldb-${hsqldb.version}.jar" property="hsqldb-found"/>
@@ -1517,7 +1535,7 @@ Use Apache Forrest version forrest-0.9-d
     <target name="download-osgi">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
-            <param name="project-path" value="org/apache/felix"/>
+            <param name="project-path" value="org/osgi"/>
             <param name="artifact-version" value="${osgi.version}"/>
             <param name="artifact-name" value="org.osgi.core"/>
             <param name="artifact-type" value="jar"/>
@@ -1841,7 +1859,7 @@ Use Apache Forrest version forrest-0.9-d
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="com/google/protobuf"/>
-            <param name="artifact-version" value="2.5.0"/>
+            <param name="artifact-version" value="${protobuf.version}"/>
             <param name="artifact-name" value="protobuf-java"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
@@ -1902,6 +1920,156 @@ 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="artifact-version" value="${c3p0.version}"/>
+            <param name="artifact-name" value="c3p0"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="com/beust"/>
+            <param name="artifact-version" value="${jcommander.version}"/>
+            <param name="artifact-name" value="jcommander"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="net/jcip"/>
+            <param name="artifact-name" value="jcip-annotations"/>
+            <param name="artifact-version" value="${jcip-annotations.version}"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="net/sf/ehcache"/>
+            <param name="artifact-name" value="ehcache-core"/>
+            <param name="artifact-version" value="${ehcache.version}"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/itadaki"/>
+            <param name="artifact-name" value="bzip2"/>
+            <param name="artifact-version" value="${bzip2.version}"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/jdom"/>
+            <param name="artifact-name" value="jdom2"/>
+            <param name="artifact-version" value="${jdom2.version}"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/quartz-scheduler"/>
+            <param name="artifact-name" value="quartz"/>
+            <param name="artifact-version" value="${quartz.version}"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="javax"/>
+            <param name="artifact-version" value="${javaee-api.version}"/>
+            <param name="artifact-name" value="javaee-api"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/opengis"/>
+            <param name="artifact-version" value="${opengis.version}"/>
+            <param name="artifact-name" value="geoapi"/>
+            <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"/>
+            <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-utility"/>
+            <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"/>
+            <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-storage"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/apache/opennlp"/>
+            <param name="artifact-version" value="${opennlp.version}"/>
+            <param name="artifact-name" value="opennlp-tools"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="com/healthmarketscience/jackcess"/>
+            <param name="artifact-version" value="${jackcess.version}"/>
+            <param name="artifact-name" value="jackcess"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="com/healthmarketscience/jackcess"/>
+            <param name="artifact-version" value="${jackcess-encrypt.version}"/>
+            <param name="artifact-name" value="jackcess-encrypt"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="com/github/junrar"/>
+            <param name="artifact-version" value="${junrar.version}"/>
+            <param name="artifact-name" value="junrar"/>
+            <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-vfs2.version}"/>
+            <param name="artifact-name" value="commons-vfs2"/>
+            <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-name" value="commons-csv"/>
+            <param name="artifact-version" value="${commons-csv.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/commons"/>
+            <param name="artifact-name" value="commons-exec"/>
+            <param name="artifact-version" value="${commons-exec.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="netcdf4"/>
+            <param name="artifact-version" value="${ucar.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="httpservices"/>
+            <param name="artifact-version" value="${ucar.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="grib"/>
+            <param name="artifact-version" value="${ucar.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="cdm"/>
+            <param name="artifact-version" value="${ucar.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="udunits"/>
+            <param name="artifact-version" value="${ucar.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"/>
@@ -1957,7 +2125,13 @@ 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="bcprov-jdk15"/>
+            <param name="artifact-name" value="bcmail-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"/>
         </antcall>
@@ -1997,25 +2171,6 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-version" value="${juniversalchardet.version}"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <!-- netcdf is a dependency of tika, but is lgpl, so we don't download it anymore
-        antcall target="download-via-maven"><param name="target" value="lib"/>
-            <param name="project-path" value="edu/ucar"/>
-            <param name="artifact-name" value="netcdf"/>
-            <param name="artifact-version" value="${netcdf.version}"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
-        <antcall target="download-via-maven"><param name="target" value="lib"/>
-            <param name="project-path" value="commons-httpclient"/>
-            <param name="artifact-name" value="commons-httpclient"/>
-            <param name="artifact-version" value="${commons-httpclient.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="unidataCommon"/>
-            <param name="artifact-version" value="${netcdf.version}"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall -->
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="de/l3s/boilerpipe"/>
             <param name="artifact-name" value="boilerpipe"/>
@@ -2089,12 +2244,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="org/bouncycastle"/>
-            <param name="artifact-name" value="bcmail-jdk15"/>
-            <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="jdom"/>
             <param name="artifact-name" value="jdom"/>
             <param name="artifact-version" value="${jdom.version}"/>

Modified: manifoldcf/trunk/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/LICENSE.txt?rev=1702242&r1=1702241&r2=1702242&view=diff
==============================================================================
--- manifoldcf/trunk/dist-license/LICENSE.txt (original)
+++ manifoldcf/trunk/dist-license/LICENSE.txt Thu Sep 10 13:00:34 2015
@@ -194,6 +194,8 @@ including, but not limited to:
   - Apache XMLGraphics-commons
   - Apache Mime4J
   - Apache XMLBeans
+  - Apache SIS
+  - Apache OpenNLP
 
 This product includes code from: http://www.json.org
 License: JSON license (http://www.json.org/license.html)
@@ -352,9 +354,6 @@ License: Apache 2 (http://www.apache.org
 This product includes a bcprov-jdk15.jar and a bcmail-jdk15.jar.
 License: BouncyCastle license (http://www.bouncycastle.org/licence.html) [MIT derivative]
 
-This product includes an xz.jar.
-License: Public domain
-
 This product includes a juniversalchardet.jar.
 License: Mozilla Public License 1.1 (MPL 1.1) (http://www.mozilla.org/MPL/MPL-1.1.html)
 
@@ -389,6 +388,44 @@ License: Apache 2 (http://www.apache.org
 This product includes a joda-time.jar.
 License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+This product includes a jackcess.jar and a jackcess-encrypt.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a javaee-api.jar.
+License: Dual license consisting of the CDDL v1.0 and GPL v2  (https://glassfish.dev.java.net/public/CDDL+GPL.html)
+Jar included under terms of CDDL v1.0 license.
+
+This product includes a geoapi.jar.
+License: Open Geospatial license (https://raw.githubusercontent.com/opengeospatial/geoapi/master/LICENSE.txt)
+
+This product includes a junrar.jar.
+License: Junrar license (https://raw.github.com/junrar/junrar/master/license.txt)
+
+This product includes a netcdf4.jar, httpservices.jar, grib.jar, cdm.jar, and udunits.jar.
+License: UCAR license (http://www.unidata.ucar.edu/software/netcdf/copyright.html)
+
+This product includes a jcommander.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a jcip-annotations.jar.
+License: Apache 2 (https://github.com/stephenc/jcip-annotations/blob/master/LICENSE.txt)
+
+This product includes a ehcache-core.jar.
+License: Apache 2 (src/assemble/EHCACHE-CORE-LICENSE.txt)
+
+This product includes a bzip2.jar.
+License: MIT license (http://opensource.org/licenses/mit-license.php)
+
+This product includes a jdom2.jar.
+License: Apache 2 without acknowledgment clause (https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt)
+
+This product includes a quartz.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a c3p0.jar.
+License: Dual license consisting of LGPL v2.1 and EPL v1.0 ((http://www.gnu.org/licenses/lgpl-2.1.html and http://www.eclipse.org/org/documents/epl-v10.php)
+Jar included under terms of EPL v1.0 license.
+
 This product includes a jetty-server.jar, jetty-servlet.jar, jetty-io.jar, jetty-jndi.jar, jetty-webapp.jar,
 jetty-plus.jar, jetty-util.jar, jetty-http.jar, jetty-security.jar, jetty-continuation.jar, jetty-xml.jar,
 jetty-jsp-jdt.jar, and jetty-schemas.jar.
@@ -660,8 +697,10 @@ resulting litigation.
 
 
 ==========================================================================
-The following license applies to eclipse-ecj.jar, and
-h2.jar:
+The following license applies to:
+eclipse-ecj.jar
+h2.jar
+c3p0.jar
 --------------------------------------------------------------------------
 
 Eclipse Public License - v 1.0
@@ -1175,6 +1214,7 @@ with venue lying in Santa Clara County,
 
 ==========================================================================
 The following license applies to:
+javaee-api.jar, from https://glassfish.java.net/nonav/public/CDDL+GPL.html,
 jaxb-impl.jar, from 'Sun JAXB Reference Implementation Runtime' (https://jaxb.dev.java.net/),
 saaj-impl.jar, from 'Sun SAAJ Standard Implementation' (https://saaj.dev.java.net/),
 streambuffer.jar, from 'XML Stream Buffer Project' (https://xmlstreambuffer.dev.java.net/),
@@ -1899,11 +1939,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 
 ==========================================================================
 The following license applies to:
-bcprov-jdk15.jar
-bcmail-jdk15.jar
+bcprov-jdk15on.jar
+bcmail-jdk15on.jar
 --------------------------------------------------------------------------
 
-Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -1911,3 +1951,105 @@ The above copyright notice and this perm
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
 
+==========================================================================
+The following license applies to:
+netcdf4.jar
+grib.jar
+cdm.jar
+udunits.jar
+httpservices.jar
+--------------------------------------------------------------------------
+Copyright 1993-2015 University Corporation for Atmospheric Research/Unidata
+
+Portions of this software were developed by the Unidata Program at the University Corporation for Atmospheric Research.
+
+Access and use of this software shall impose the following obligations and understandings on the user. The user is granted the right, without any fee or cost, to use, copy, modify, alter, enhance and distribute this software, and any derivative works thereof, and its supporting documentation for any purpose whatsoever, provided that this entire notice appears in all copies of the software, derivative works and supporting documentation. Further, UCAR requests that the user credit UCAR/Unidata in any publications that result from the use of this software or in any product that includes this software, although this is not an obligation. The names UCAR and/or Unidata, however, may not be used in any advertising or publicity to endorse or promote any products or commercial entity unless specific written permission is obtained from UCAR/Unidata. The user also understands that UCAR/Unidata is not obligated to provide the user with any support, consulting, training or assistance of any kind
  with regard to the use, operation and performance of this software nor to provide the user with any updates, revisions, new versions or "bug fixes."
+
+THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
+
+==========================================================================
+The following license applies to:
+junrar.jar
+--------------------------------------------------------------------------
+ ******    *****   ******   UnRAR - free utility for RAR archives
+ **   **  **   **  **   **  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ******   *******  ******    License for use and distribution of
+ **   **  **   **  **   **   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ **   **  **   **  **   **         FREE portable version
+                                   ~~~~~~~~~~~~~~~~~~~~~
+
+      The source code of UnRAR utility is freeware. This means:
+
+   1. All copyrights to RAR and the utility UnRAR are exclusively
+      owned by the author - Alexander Roshal.
+
+   2. The UnRAR sources may be used in any software to handle RAR
+      archives without limitations free of charge, but cannot be used
+      to re-create the RAR compression algorithm, which is proprietary.
+      Distribution of modified UnRAR sources in separate form or as a
+      part of other software is permitted, provided that it is clearly
+      stated in the documentation and source comments that the code may
+      not be used to develop a RAR (WinRAR) compatible archiver.
+
+   3. The UnRAR utility may be freely distributed. It is allowed
+      to distribute UnRAR inside of other software packages.
+
+   4. THE RAR ARCHIVER AND THE UnRAR UTILITY ARE DISTRIBUTED "AS IS".
+      NO WARRANTY OF ANY KIND IS EXPRESSED OR IMPLIED.  YOU USE AT 
+      YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, 
+      DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING
+      OR MISUSING THIS SOFTWARE.
+
+   5. Installing and using the UnRAR utility signifies acceptance of
+      these terms and conditions of the license.
+
+   6. If you don't agree with terms of the license you must remove
+      UnRAR files from your storage devices and cease to use the
+      utility.
+
+      Thank you for your interest in RAR and UnRAR.
+
+
+                                            Alexander L. Roshal
+
+==========================================================================
+The following license applies to:
+geoapi.jar
+--------------------------------------------------------------------------
+
+GeoAPI - Java interfaces for OGC/ISO standards
+http://www.geoapi.org
+
+Copyright (C) 2003-2015 Open Geospatial Consortium, Inc.
+All Rights Reserved. http://www.opengeospatial.org/ogc/legal
+
+This OGC work (including software, documents, or other related items) is being
+provided by the copyright holders under the following license. By obtaining,
+using and/or copying this work, you (the licensee) agree that you have read,
+understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, and modify this software and its documentation, with
+or without modification, for any purpose and without fee or royalty is hereby
+granted, provided that you include the following on ALL copies of the software
+and documentation or portions thereof, including modifications, that you make:
+
+   1. The full text of this NOTICE in a location viewable to users of the
+      redistributed or derivative work.
+   2. Notice of any changes or modifications to the OGC files, including the
+      date changes were made. (We recommend you provide URIs to the location
+      from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at all
+times remain with copyright holders.
+

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1702242&r1=1702241&r2=1702242&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Thu Sep 10 13:00:34 2015
@@ -84,20 +84,41 @@
             <include name="jackson-databind*.jar"/>
             <include name="jackson-annotations*.jar"/>
             <include name="tika-parsers*.jar"/>
+            <include name="javaee-api*.jar"/>
+            <include name="geoapi*.jar"/>
+            <include name="sis-metadata*.jar"/>
+            <include name="sis-utility*.jar"/>
+            <include name="sis-netcdf*.jar"/>
+            <include name="sis-storage*.jar"/>
+            <include name="opennlp-tools*.jar"/>
+            <include name="jackcess*.jar"/>
+            <include name="junrar*.jar"/>
+            <include name="commons-vfs2*.jar"/>
+            <include name="commons-csv*.jar"/>
+            <include name="commons-exec*.jar"/>
+            <include name="netcdf4*.jar"/>
+            <include name="httpservices*.jar"/>
+            <include name="grib*.jar"/>
+            <include name="cdm*.jar"/>
+            <include name="udunits*.jar"/>
+            <include name="jcommander*.jar"/>
+            <include name="jcip-annotations*.jar"/>
+            <include name="ehcache-core*.jar"/>
+            <include name="bzip2*.jar"/>
+            <include name="jdom2*.jar"/>
+            <include name="quartz*.jar"/>
+            <include name="c3p0*.jar"/>
             <include name="tagsoup*.jar"/>
             <include name="poi*.jar"/>
             <include name="vorbis-java*.jar"/>
-            <include name="netcdf*.jar"/>
-            <include name="unidataCommon*.jar"/>
-            <include name="commons-httpclient*.jar"/>
             <include name="apache-mime4j-core*.jar"/>
             <include name="apache-mime4j-dom*.jar"/>
             <include name="commons-compress*.jar"/>
             <include name="pdfbox*.jar"/>
             <include name="fontbox*.jar"/>
             <include name="jempbox*.jar"/>
-            <include name="bcmail-jdk15*.jar"/>
-            <include name="bcprov-jdk15*.jar"/>
+            <include name="bcmail-jdk15on*.jar"/>
+            <include name="bcprov-jdk15on*.jar"/>
             <include name="xmlbeans*.jar"/>
             <include name="dom4j*.jar"/>
             <include name="geronimo-stax-api_1.0_spec*.jar"/>
@@ -1353,6 +1374,30 @@
                 <include name="jackson-databind*.jar"/>
                 <include name="jackson-annotations*.jar"/>
                 <include name="tika-parsers*.jar"/>
+                <include name="javaee-api*.jar"/>
+                <include name="geoapi*.jar"/>
+                <include name="sis-metadata*.jar"/>
+                <include name="sis-utility*.jar"/>
+                <include name="sis-netcdf*.jar"/>
+                <include name="sis-storage*.jar"/>
+                <include name="opennlp-tools*.jar"/>
+                <include name="jackcess*.jar"/>
+                <include name="junrar*.jar"/>
+                <include name="commons-vfs2*.jar"/>
+                <include name="commons-csv*.jar"/>
+                <include name="commons-exec*.jar"/>
+                <include name="netcdf4*.jar"/>
+                <include name="httpservices*.jar"/>
+                <include name="grib*.jar"/>
+                <include name="cdm*.jar"/>
+                <include name="udunits*.jar"/>
+                <include name="jcommander*.jar"/>
+                <include name="jcip-annotations*.jar"/>
+                <include name="ehcache-core*.jar"/>
+                <include name="bzip2*.jar"/>
+                <include name="jdom2*.jar"/>
+                <include name="quartz*.jar"/>
+                <include name="c3p0*.jar"/>
                 <include name="tagsoup*.jar"/>
                 <include name="poi*.jar"/>
                 <include name="vorbis-java*.jar"/>

Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1702242&r1=1702241&r2=1702242&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Thu Sep 10 13:00:34 2015
@@ -194,6 +194,8 @@ including, but not limited to:
   - Apache XMLGraphics-commons
   - Apache Mime4J
   - Apache XMLBeans
+  - Apache SIS
+  - Apache OpenNLP
 
 This product includes code from: http://www.json.org
 License: JSON license (http://www.json.org/license.html)
@@ -401,6 +403,44 @@ License: Apache 2 (http://www.apache.org
 This product includes a joda-time.jar.
 License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+This product includes a jackcess.jar and a jackcess-encrypt.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a javaee-api.jar.
+License: Dual license consisting of the CDDL v1.0 and GPL v2  (https://glassfish.dev.java.net/public/CDDL+GPL.html)
+Jar included under terms of CDDL v1.0 license.
+
+This product includes a geoapi.jar.
+License: Open Geospatial license (https://raw.githubusercontent.com/opengeospatial/geoapi/master/LICENSE.txt)
+
+This product includes a junrar.jar.
+License: Junrar license (https://raw.github.com/junrar/junrar/master/license.txt)
+
+This product includes a netcdf4.jar, httpservices.jar, grib.jar, cdm.jar, and udunits.jar.
+License: UCAR license (http://www.unidata.ucar.edu/software/netcdf/copyright.html)
+
+This product includes a jcommander.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a jcip-annotations.jar.
+License: Apache 2 (https://github.com/stephenc/jcip-annotations/blob/master/LICENSE.txt)
+
+This product includes a ehcache-core.jar.
+License: Apache 2 (src/assemble/EHCACHE-CORE-LICENSE.txt)
+
+This product includes a bzip2.jar.
+License: MIT license (http://opensource.org/licenses/mit-license.php)
+
+This product includes a jdom2.jar.
+License: Apache 2 without acknowledgment clause (https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt)
+
+This product includes a quartz.jar.
+License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a c3p0.jar.
+License: Dual license consisting of LGPL v2.1 and EPL v1.0 (http://www.gnu.org/licenses/lgpl-2.1.html and http://www.eclipse.org/org/documents/epl-v10.php)
+Jar included under terms of EPL v1.0 license.
+
 This product may include pdf files that embed IPA-licensed fonts.
 License: IPA Font License Agreement v1.0 (http://ossipedia.ipa.go.jp/ipafont/index.html#LicenseEng)
 
@@ -666,8 +706,10 @@ resulting litigation.
 
 
 ==========================================================================
-The following license applies to eclipse-ecj.jar, and
-h2.jar:
+The following license applies to:
+eclipse-ecj.jar
+h2.jar
+c3p0.jar
 --------------------------------------------------------------------------
 
 Eclipse Public License - v 1.0
@@ -1181,6 +1223,7 @@ with venue lying in Santa Clara County,
 
 ==========================================================================
 The following license applies to:
+javaee-api.jar, from https://glassfish.java.net/nonav/public/CDDL+GPL.html,
 jaxb-impl.jar, from 'Sun JAXB Reference Implementation Runtime' (https://jaxb.dev.java.net/),
 saaj-impl.jar, from 'Sun SAAJ Standard Implementation' (https://saaj.dev.java.net/),
 streambuffer.jar, from 'XML Stream Buffer Project' (https://xmlstreambuffer.dev.java.net/),
@@ -1905,14 +1948,116 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 
 ==========================================================================
 The following license applies to:
-bcprov-jdk15.jar
-bcmail-jdk15.jar
+bcprov-jdk15on.jar
+bcmail-jdk15on.jar
 --------------------------------------------------------------------------
 
-Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+
+==========================================================================
+The following license applies to:
+netcdf4.jar
+grib.jar
+cdm.jar
+udunits.jar
+httpservices.jar
+--------------------------------------------------------------------------
+Copyright 1993-2015 University Corporation for Atmospheric Research/Unidata
+
+Portions of this software were developed by the Unidata Program at the University Corporation for Atmospheric Research.
+
+Access and use of this software shall impose the following obligations and understandings on the user. The user is granted the right, without any fee or cost, to use, copy, modify, alter, enhance and distribute this software, and any derivative works thereof, and its supporting documentation for any purpose whatsoever, provided that this entire notice appears in all copies of the software, derivative works and supporting documentation. Further, UCAR requests that the user credit UCAR/Unidata in any publications that result from the use of this software or in any product that includes this software, although this is not an obligation. The names UCAR and/or Unidata, however, may not be used in any advertising or publicity to endorse or promote any products or commercial entity unless specific written permission is obtained from UCAR/Unidata. The user also understands that UCAR/Unidata is not obligated to provide the user with any support, consulting, training or assistance of any kind
  with regard to the use, operation and performance of this software nor to provide the user with any updates, revisions, new versions or "bug fixes."
+
+THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
+
+==========================================================================
+The following license applies to:
+junrar.jar
+--------------------------------------------------------------------------
+ ******    *****   ******   UnRAR - free utility for RAR archives
+ **   **  **   **  **   **  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ******   *******  ******    License for use and distribution of
+ **   **  **   **  **   **   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ **   **  **   **  **   **         FREE portable version
+                                   ~~~~~~~~~~~~~~~~~~~~~
+
+      The source code of UnRAR utility is freeware. This means:
+
+   1. All copyrights to RAR and the utility UnRAR are exclusively
+      owned by the author - Alexander Roshal.
+
+   2. The UnRAR sources may be used in any software to handle RAR
+      archives without limitations free of charge, but cannot be used
+      to re-create the RAR compression algorithm, which is proprietary.
+      Distribution of modified UnRAR sources in separate form or as a
+      part of other software is permitted, provided that it is clearly
+      stated in the documentation and source comments that the code may
+      not be used to develop a RAR (WinRAR) compatible archiver.
+
+   3. The UnRAR utility may be freely distributed. It is allowed
+      to distribute UnRAR inside of other software packages.
+
+   4. THE RAR ARCHIVER AND THE UnRAR UTILITY ARE DISTRIBUTED "AS IS".
+      NO WARRANTY OF ANY KIND IS EXPRESSED OR IMPLIED.  YOU USE AT 
+      YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, 
+      DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING
+      OR MISUSING THIS SOFTWARE.
+
+   5. Installing and using the UnRAR utility signifies acceptance of
+      these terms and conditions of the license.
+
+   6. If you don't agree with terms of the license you must remove
+      UnRAR files from your storage devices and cease to use the
+      utility.
+
+      Thank you for your interest in RAR and UnRAR.
+
+
+                                            Alexander L. Roshal
+					    
+==========================================================================
+The following license applies to:
+geoapi.jar
+--------------------------------------------------------------------------
+
+GeoAPI - Java interfaces for OGC/ISO standards
+http://www.geoapi.org
+
+Copyright (C) 2003-2015 Open Geospatial Consortium, Inc.
+All Rights Reserved. http://www.opengeospatial.org/ogc/legal
+
+This OGC work (including software, documents, or other related items) is being
+provided by the copyright holders under the following license. By obtaining,
+using and/or copying this work, you (the licensee) agree that you have read,
+understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, and modify this software and its documentation, with
+or without modification, for any purpose and without fee or royalty is hereby
+granted, provided that you include the following on ALL copies of the software
+and documentation or portions thereof, including modifications, that you make:
+
+   1. The full text of this NOTICE in a location viewable to users of the
+      redistributed or derivative work.
+   2. Notice of any changes or modifications to the OGC files, including the
+      date changes were made. (We recommend you provide URIs to the location
+      from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at all
+times remain with copyright holders.

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1702242&r1=1702241&r2=1702242&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Thu Sep 10 13:00:34 2015
@@ -54,7 +54,7 @@
     <axis.version>1.4</axis.version>
     <wsdl4j.version>1.6.2</wsdl4j.version>
     <castor.version>1.0.5</castor.version>
-    <commons-codec.version>1.9</commons-codec.version>
+    <commons-codec.version>1.10</commons-codec.version>
     <commons-io.version>2.4</commons-io.version>
     <commons-logging.version>1.2</commons-logging.version>
     <commons-collections.version>3.2.1</commons-collections.version>
@@ -76,15 +76,14 @@
     <jstl.version>1.2</jstl.version>
     <glassfish.version>2.1.v20091210</glassfish.version>
     <log4j.version>1.2.16</log4j.version>
-    <jdbcpool.version>0.99</jdbcpool.version>
     <json.version>20090211</json.version>
     <velocity.version>1.7</velocity.version>
     <slf4j.version>1.7.7</slf4j.version>
     <jaxb.version>2.2.6</jaxb.version>
     <zookeeper.version>3.4.6</zookeeper.version>
     <xmlbeans.version>2.6.0</xmlbeans.version>
-    <poi.version>3.11</poi.version>
-    <tika.version>1.7</tika.version>
+    <poi.version>3.13-beta1</poi.version>
+    <tika.version>1.10</tika.version>
     <jhighlight.version>1.0.2</jhighlight.version>
     <boilerpipe.version>1.1.0</boilerpipe.version>
     <hadoop.version>2.6.0</hadoop.version>



Mime
View raw message