manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1559060 - in /manifoldcf/branches/release-1.5-branch: ./ CHANGES.txt framework/build.xml
Date Fri, 17 Jan 2014 10:12:43 GMT
Author: kwright
Date: Fri Jan 17 10:12:42 2014
New Revision: 1559060

URL: http://svn.apache.org/r1559060
Log:
Pull up fix for CONNECTORS-860 from trunk

Modified:
    manifoldcf/branches/release-1.5-branch/   (props changed)
    manifoldcf/branches/release-1.5-branch/CHANGES.txt
    manifoldcf/branches/release-1.5-branch/framework/build.xml

Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1559059

Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1559060&r1=1559059&r2=1559060&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Fri Jan 17 10:12:42 2014
@@ -3,6 +3,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/branches/release-1.5-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/framework/build.xml?rev=1559060&r1=1559059&r2=1559060&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-1.5-branch/framework/build.xml Fri Jan 17 10:12:42 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"/>



Mime
View raw message