You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/12/18 09:47:12 UTC

svn commit: r1646403 - in /manifoldcf/trunk: CHANGES.txt dist-license/LICENSE.txt framework/build.xml framework/buildfiles/connector-build.xml lib-license/LICENSE.txt

Author: kwright
Date: Thu Dec 18 08:47:12 2014
New Revision: 1646403

URL: http://svn.apache.org/r1646403
Log:
Fix for CONNECTORS-1125.

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

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1646403&r1=1646402&r2=1646403&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Dec 18 08:47:12 2014
@@ -8,6 +8,10 @@ CONNECTORS-1124: start.jar in example-pr
 
 ======================= Release 2.0 =====================
 
+CONNECTORS-1125: Make sure xz jar is delivered to where Tika needs
+it.
+(Kamil Żyta, Karl Wright)
+
 CONNECTORS-1123: Reduce the maximum number of zookeeper lock
 nodes, by hashing the lock names that correspond to documents.
 (Aeham Abushwashi, Karl Wright)

Modified: manifoldcf/trunk/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/LICENSE.txt?rev=1646403&r1=1646402&r2=1646403&view=diff
==============================================================================
--- manifoldcf/trunk/dist-license/LICENSE.txt (original)
+++ manifoldcf/trunk/dist-license/LICENSE.txt Thu Dec 18 08:47:12 2014
@@ -380,6 +380,9 @@ License: Apache 2 (http://www.apache.org
 This product includes an isoparser.jar.
 License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+This product includes an xz.jar.
+License: Public domain
+
 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.

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1646403&r1=1646402&r2=1646403&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Thu Dec 18 08:47:12 2014
@@ -116,6 +116,7 @@
             <include name="jhighlight*.jar"/>
             <include name="jmatio*.jar"/>
             <include name="java-libpst*.jar"/>
+            <include name="xz*.jar"/>
         </fileset>
         <fileset dir="../lib">
             <include name="castor*.jar"/>
@@ -1384,6 +1385,7 @@
                 <include name="jhighlight*.jar"/>
                 <include name="jmatio*.jar"/>
                 <include name="java-libpst*.jar"/>
+                <include name="xz*.jar"/>
             </fileset>
             <fileset dir="../lib">
                 <include name="castor*.jar"/>

Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1646403&r1=1646402&r2=1646403&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Thu Dec 18 08:47:12 2014
@@ -180,6 +180,7 @@
             <include name="jhighlight*.jar"/>
             <include name="jmatio*.jar"/>
             <include name="java-libpst*.jar"/>
+            <include name="xz*.jar"/>
         </fileset>
         <fileset dir="${mcf-dist}/connector-common-lib">
             <include name="axis*.jar"/>

Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1646403&r1=1646402&r2=1646403&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Thu Dec 18 08:47:12 2014
@@ -380,6 +380,9 @@ License: Apache 2 (http://www.apache.org
 This product includes an isoparser.jar.
 License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+This product includes an xz.jar.
+License: Public domain
+
 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.