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/01/17 11:11:41 UTC

svn commit: r1559059 - in /manifoldcf/trunk: CHANGES.txt framework/build.xml

Author: kwright
Date: Fri Jan 17 10:11:41 2014
New Revision: 1559059

URL: http://svn.apache.org/r1559059
Log:
Fix for CONNECTORS-860.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/build.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1559059&r1=1559058&r2=1559059&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Jan 17 10:11:41 2014
@@ -5,6 +5,12 @@ $Id$
 
 ======================= Release 1.5 =====================
 
+CONNECTORS-860: Remove zookeeper.jar from a number of contexts
+where it should not be.  This will reduce the binary footprint by some
+amount and also prevent more than one zookeeper.jar from being in
+the classpath at a time.
+(Karl Wright)
+
 CONNECTORS-858: HDFS repository and output connectors need to be
 fully compatible with multiple Hadoop 2.2.0 file system protocols.
 (Minoru Osuka, Karl Wright)

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1559059&r1=1559058&r2=1559059&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Fri Jan 17 10:11:41 2014
@@ -949,7 +949,7 @@
         <mkdir dir="dist/multiprocess-file-example/lib"/>
         <copy todir="dist/multiprocess-file-example/lib">
             <fileset dir="../lib">
-                <include name="zookeeper*.jar"/>
+                <!-- include name="zookeeper*.jar"/ -->
                 <include name="json*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
@@ -994,7 +994,7 @@
         <mkdir dir="dist/multiprocess-file-example-proprietary/lib"/>
         <copy todir="dist/multiprocess-file-example-proprietary/lib">
             <fileset dir="../lib">
-                <include name="zookeeper*.jar"/>
+                <!-- include name="zookeeper*.jar"/ -->
                 <include name="json*.jar"/>
                 <include name="commons-logging*.jar"/>
                 <include name="log4j*.jar"/>
@@ -1145,7 +1145,7 @@
         <mkdir dir="dist/example/lib"/>
         <copy todir="dist/example/lib">
             <fileset dir="../lib">
-                <include name="zookeeper*.jar"/>
+                <!-- include name="zookeeper*.jar"/ -->
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>
@@ -1275,7 +1275,7 @@
         <mkdir dir="dist/example-proprietary/lib"/>
         <copy todir="dist/example-proprietary/lib">
             <fileset dir="../lib">
-                <include name="zookeeper*.jar"/>
+                <!-- include name="zookeeper*.jar"/ -->
                 <include name="json*.jar"/>
                 <include name="commons-codec*.jar"/>
                 <include name="commons-collections*.jar"/>