manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1756425 - in /manifoldcf/trunk: CHANGES.txt build.xml dist-license/LICENSE.txt framework/build.xml framework/buildfiles/connector-build.xml lib-license/LICENSE.txt pom.xml
Date Mon, 15 Aug 2016 20:33:29 GMT
Author: kwright
Date: Mon Aug 15 20:33:29 2016
New Revision: 1756425

URL: http://svn.apache.org/viewvc?rev=1756425&view=rev
Log:
Fix for CONNECTORS-1316.  Committed on behalf of Furkan KAMACI.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/dist-license/LICENSE.txt
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/framework/buildfiles/connector-build.xml
    manifoldcf/trunk/lib-license/LICENSE.txt
    manifoldcf/trunk/pom.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1756425&r1=1756424&r2=1756425&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Aug 15 20:33:29 2016
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.5-dev =====================
 
+CONNECTORS-1316: Upgrade to Tika 1.13.
+(Furkan KAMACI)
+
 CONNECTORS-1334: Break out forbidden api check into separate
 precommit target.
 (Furkan KAMACI)

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1756425&r1=1756424&r2=1756425&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Mon Aug 15 20:33:29 2016
@@ -92,7 +92,7 @@
     <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"/>
+    <property name="jackson-core.version" value="2.7.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"/>
@@ -101,17 +101,18 @@
     <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.12"/>
+    <property name="tika.version" value="1.13"/>
     <property name="tagsoup.version" value="1.2.1"/>
     <property name="james.version" value="0.7.2"/>
     <property name="vorbis.version" value="0.8"/>
-    <property name="metadata-extractor.version" value="2.9.1"/>
+    <property name="metadata-extractor.version" value="2.8.1"/>
     <property name="aspectjrt.version" value="1.8.6"/>
     <property name="jhighlight.version" value="1.0.3"/>
     <property name="xmlbeans.version" value="2.6.0"/>
     <property name="bc.version" value="1.54"/>
     <property name="tukaani.version" value="1.5"/>
-    <property name="pdfbox.version" value="1.8.11"/>
+    <property name="pdfbox.version" value="2.0.1"/>
+    <property name="jempbox.version" value="1.8.12"/>
     <property name="commons-compress.version" value="1.11"/>
     <property name="commons-csv.version" value="1.2"/>
     <property name="commons-exec.version" value="1.3"/>
@@ -153,7 +154,7 @@
     <property name="xmlschema.version" value="2.2.1"/>
     <property name="annotation-api.version" value="1.2"/>
     <property name="javax.ws.rs-api.version" value="2.0.1"/>
-    
+    <property name="virtuald.version" value="1.03"/>
     <property name="rat.bootstrap.version" value="0.12"/>
     <property name="rat_checksum_sha1" value="16398550402b27f81cd0d508cef54b3e47a4a6da"/>
     <property name="rat_install_path" location="${user.home}/.ant/lib" />
@@ -196,7 +197,7 @@
         </condition>
       </fail>
     </target>
-    
+
     <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"/>
@@ -2079,6 +2080,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-referencing"/>
+            <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"/>
@@ -2217,6 +2224,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/bouncycastle"/>
+            <param name="artifact-name" value="bcpkix-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/tukaani"/>
             <param name="artifact-name" value="xz"/>
             <param name="artifact-version" value="${tukaani.version}"/>
@@ -2225,7 +2238,7 @@ Use Apache Forrest version forrest-0.9-d
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="org/apache/pdfbox"/>
             <param name="artifact-name" value="jempbox"/>
-            <param name="artifact-version" value="${pdfbox.version}"/>
+            <param name="artifact-version" value="${jempbox.version}"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
@@ -2241,6 +2254,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="org/apache/pdfbox"/>
+            <param name="artifact-name" value="pdfbox-debugger"/>
+            <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-tools"/>
+            <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/commons"/>
             <param name="artifact-name" value="commons-compress"/>
             <param name="artifact-version" value="${commons-compress.version}"/>
@@ -2402,6 +2427,12 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-version" value="${java-libpst.version}"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="com/github/virtuald"/>
+            <param name="artifact-version" value="${virtuald.version}"/>
+            <param name="artifact-name" value="curvesapi"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
     </target>
     
     <target name="download-jackson">

Modified: manifoldcf/trunk/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/LICENSE.txt?rev=1756425&r1=1756424&r2=1756425&view=diff
==============================================================================
--- manifoldcf/trunk/dist-license/LICENSE.txt (original)
+++ manifoldcf/trunk/dist-license/LICENSE.txt Mon Aug 15 20:33:29 2016
@@ -446,6 +446,36 @@ License: Apache 2 (http://www.apache.org
 This product includes a snappy-java.jar.
 License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+This product includes fontbox jar: http://pdfbox.apache.org/
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes fontbox jempbox jar: http://www.apache.org/pdfbox-parent/jempbox/
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes fontbox pdfbox jar: http://www.apache.org/pdfbox-parent/pdfbox/
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a pdfbox-debugger.jar: http://www.apache.org/pdfbox-parent/pdfbox-debugger/
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a pdfbox-tools.jar: http://www.apache.org/pdfbox-parent/pdfbox-debugger
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-metadata.jar: http://sis.apache.org/core/sis-metadata
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-referencing.jar: http://sis.apache.org/core/sis-referencing
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-utility.jar: http://sis.apache.org/core/sis-utility
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-netcdf.jar: http://sis.apache.org/storage/sis-netcdf
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-storage.jar: http://sis.apache.org/storage/sis-storage
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
 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.
@@ -455,6 +485,9 @@ Distributed under terms of Apache 2 lice
 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)
 
+This product includes a curvesapi.jar: https://github.com/virtuald/curvesapi
+License: BSD License (http://opensource.org/licenses/BSD-3-Clause)
+
 ==========================================================================
 The following license applies to json.jar, which is generated from the json
 sources from http://www.json.org/java/index.html
@@ -2173,6 +2206,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 The following license applies to:
 bcprov-jdk15on.jar
 bcmail-jdk15on.jar
+bcpkix-jdk15on:jar
+bcprov-jdk15on:jar
 --------------------------------------------------------------------------
 
 Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1756425&r1=1756424&r2=1756425&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Mon Aug 15 20:33:29 2016
@@ -119,6 +119,8 @@
             <include name="jempbox*.jar"/>
             <include name="bcmail-jdk15on*.jar"/>
             <include name="bcprov-jdk15on*.jar"/>
+            <include name="bcpkix-jdk15on*.jar"/>
+            <include name="curvesapi*.jar"/>
             <include name="xmlbeans*.jar"/>
             <include name="dom4j*.jar"/>
             <include name="geronimo-stax-api_1.0_spec*.jar"/>
@@ -1429,6 +1431,8 @@
                 <include name="zookeeper*.jar"/>
                 <include name="bcmail-jdk15*.jar"/>
                 <include name="bcprov-jdk15*.jar"/>
+                <include name="bcpkix-jdk15*.jar"/>
+                <include name="curvesapi*.jar"/>
                 <include name="xmlbeans*.jar"/>
                 <include name="dom4j*.jar"/>
                 <include name="geronimo-stax-api_1.0_spec*.jar"/>

Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1756425&r1=1756424&r2=1756425&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Mon Aug 15 20:33:29 2016
@@ -183,6 +183,8 @@
             <include name="jempbox*.jar"/>
             <include name="bcmail-jdk15on*.jar"/>
             <include name="bcprov-jdk15on*.jar"/>
+            <include name="bcpkix-jdk15on*.jar"/>
+            <include name="curvesapi*.jar"/>
             <include name="xmlbeans*.jar"/>
             <include name="dom4j*.jar"/>
             <include name="geronimo-stax-api_1.0_spec*.jar"/>

Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1756425&r1=1756424&r2=1756425&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Mon Aug 15 20:33:29 2016
@@ -461,9 +461,42 @@ License: Apache 2 (http://www.apache.org
 This product includes a snappy-java.jar.
 License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+This product includes fontbox jar: http://pdfbox.apache.org/
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes fontbox jempbox jar: http://www.apache.org/pdfbox-parent/jempbox/
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes fontbox pdfbox jar: http://www.apache.org/pdfbox-parent/pdfbox/
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a pdfbox-debugger.jar: http://www.apache.org/pdfbox-parent/pdfbox-debugger/
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a pdfbox-tools.jar: http://www.apache.org/pdfbox-parent/pdfbox-debugger
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-metadata.jar: http://sis.apache.org/core/sis-metadata
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-referencing.jar: http://sis.apache.org/core/sis-referencing
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-utility.jar: http://sis.apache.org/core/sis-utility
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-netcdf.jar: http://sis.apache.org/storage/sis-netcdf
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+This product includes a sis-storage.jar: http://sis.apache.org/storage/sis-storage
+License: Apache License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
 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)
 
+This product includes a curvesapi.jar: https://github.com/virtuald/curvesapi
+License: BSD License (http://opensource.org/licenses/BSD-3-Clause)
+
 ==========================================================================
 The following license applies to json.jar, which is generated from the json
 sources from http://www.json.org/java/index.html
@@ -2182,6 +2215,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 The following license applies to:
 bcprov-jdk15on.jar
 bcmail-jdk15on.jar
+bcpkix-jdk15on:jar
+bcprov-jdk15on:jar
 --------------------------------------------------------------------------
 
 Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1756425&r1=1756424&r2=1756425&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Mon Aug 15 20:33:29 2016
@@ -84,7 +84,7 @@
     <zookeeper.version>3.4.8</zookeeper.version>
     <xmlbeans.version>2.6.0</xmlbeans.version>
     <poi.version>3.13</poi.version>
-    <tika.version>1.12</tika.version>
+    <tika.version>1.13</tika.version>
     <jhighlight.version>1.0.3</jhighlight.version>
     <boilerpipe.version>1.1.0</boilerpipe.version>
     <hadoop.version>2.6.0</hadoop.version>



Mime
View raw message