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:48:52 UTC
svn commit: r1646404 - in /manifoldcf/branches/release-2.0-branch: ./
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:48:52 2014
New Revision: 1646404
URL: http://svn.apache.org/r1646404
Log:
Pull up fix for CONNECTORS-1125 from trunk.
Modified:
manifoldcf/branches/release-2.0-branch/ (props changed)
manifoldcf/branches/release-2.0-branch/CHANGES.txt
manifoldcf/branches/release-2.0-branch/dist-license/LICENSE.txt
manifoldcf/branches/release-2.0-branch/framework/build.xml
manifoldcf/branches/release-2.0-branch/framework/buildfiles/connector-build.xml
manifoldcf/branches/release-2.0-branch/lib-license/LICENSE.txt
Propchange: manifoldcf/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 08:48:52 2014
@@ -119,4 +119,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317
+/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646403
Modified: manifoldcf/branches/release-2.0-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/CHANGES.txt?rev=1646404&r1=1646403&r2=1646404&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.0-branch/CHANGES.txt Thu Dec 18 08:48:52 2014
@@ -3,6 +3,10 @@ $Id$
======================= 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/branches/release-2.0-branch/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/dist-license/LICENSE.txt?rev=1646404&r1=1646403&r2=1646404&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/dist-license/LICENSE.txt (original)
+++ manifoldcf/branches/release-2.0-branch/dist-license/LICENSE.txt Thu Dec 18 08:48:52 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/branches/release-2.0-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/build.xml?rev=1646404&r1=1646403&r2=1646404&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-2.0-branch/framework/build.xml Thu Dec 18 08:48:52 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/branches/release-2.0-branch/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/buildfiles/connector-build.xml?rev=1646404&r1=1646403&r2=1646404&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/release-2.0-branch/framework/buildfiles/connector-build.xml Thu Dec 18 08:48:52 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/branches/release-2.0-branch/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/lib-license/LICENSE.txt?rev=1646404&r1=1646403&r2=1646404&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/lib-license/LICENSE.txt (original)
+++ manifoldcf/branches/release-2.0-branch/lib-license/LICENSE.txt Thu Dec 18 08:48:52 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.