ZOOKEEPER-1791. ZooKeeper package includes unnecessary jars that are part of the package. (mahadev via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1595559 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -654,6 +654,9 @@ BUGFIXES:
   ZOOKEEPER-1797. PurgeTxnLog may delete data logs during roll (Rakesh R via
   michim)
 
+  ZOOKEEPER-1791. ZooKeeper package includes unnecessary jars that are part of
+  the package. (mahadev via michim)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

ivy.xml

@@ -46,7 +46,7 @@
     <dependency org="commons-cli" name="commons-cli" rev="1.2" />
   
     <dependency org="org.apache.maven.wagon" name="wagon-http" rev="2.4" conf="mvn-ant-task->default"/>
-    <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.3" conf="mvn-ant-task->default"/>
+    <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.3" conf="mvn-ant-task->master"/>
     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
     <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false" conf="default"/>
     <dependency org="jline" name="jline" rev="2.11" transitive="false" conf="optional->default"/>

src/contrib/build.xml

@@ -20,7 +20,7 @@
 <project name="zookeepercontrib" default="compile" basedir=".">
 
   <property name="contribfilesetincludes" value="*/build.xml" />
-  <property name="contribfilesetexcludes" value="" />
+  <property name="contribfilesetexcludes" value="fatjar/build.xml" />
 
   <fileset id="contribfileset" dir=".">
     <include name="${contribfilesetincludes}"/>