You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2016/03/03 17:12:56 UTC

svn commit: r1733489 - in /zookeeper/trunk: ./ src/contrib/ src/contrib/zkpython/ src/contrib/zkpython/src/packages/ src/packages/ src/recipes/

Author: phunt
Date: Thu Mar  3 16:12:55 2016
New Revision: 1733489

URL: http://svn.apache.org/viewvc?rev=1733489&view=rev
Log:
ZOOKEEPER-1604 remove rpm/deb/... packaging (cnauroth via phunt)

Removed:
    zookeeper/trunk/src/contrib/zkpython/src/packages/
    zookeeper/trunk/src/packages/
Modified:
    zookeeper/trunk/README_packaging.txt
    zookeeper/trunk/build.xml
    zookeeper/trunk/ivy.xml
    zookeeper/trunk/src/contrib/build-contrib.xml
    zookeeper/trunk/src/contrib/build.xml
    zookeeper/trunk/src/contrib/zkpython/build.xml
    zookeeper/trunk/src/contrib/zkpython/ivy.xml
    zookeeper/trunk/src/recipes/build-recipes.xml
    zookeeper/trunk/src/recipes/build.xml

Modified: zookeeper/trunk/README_packaging.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/README_packaging.txt?rev=1733489&r1=1733488&r2=1733489&view=diff
==============================================================================
--- zookeeper/trunk/README_packaging.txt (original)
+++ zookeeper/trunk/README_packaging.txt Thu Mar  3 16:12:55 2016
@@ -20,47 +20,26 @@ apt-get --install python-setuptools
 Package build command
 ---------------------
 
-Command to build Debian package: ant deb
-Command to build RPM Package: ant rpm
+The ZooKeeper project publishes releases as tarballs.  For ZooKeeper packages
+specific to your OS (such as rpm and deb), consider using Apache Bigtop:
 
-rpm and deb packages are generated and placed in:
+http://bigtop.apache.org/
 
-build/zookeeper*.[rpm|deb]
-build/contrib/**.[rpm|deb]
+Command to build tarball package: ant tar
 
-Default package file structure layout
-
-  /usr/bin                           - User executable
-  /usr/sbin                          - System executable
-  /usr/libexec                       - Configuration boot trap script
-  /usr/lib                           - Native libraries
-  /usr/share/doc/zookeeper           - Documents
-  /usr/share/zookeeper               - Project files
-  /usr/share/zookeeper/template/conf - Configuration template files
-  /etc/zookeeper                     - Configuration files
-  /etc/init.d/zookeeper              - OS startup script
+zookeeper-<version>.tar.gz tarball file structure layout
 
-Source file structure layout
----------------------
-
-src/packages/update-zookeeper-env.sh 
-  - setup environment variables and symlink $PREFIX/etc/zookeeper to 
-    /etc/zookeeper.
-  - This script is designed to run in post installation, and pre-remove 
-    phase of ZooKeeper package.
-  - Run update-zookeeper-env.sh -h to get a list of supported parameters.
-
-src/packages/template
-  - Standard configuration template
-
-src/packages/deb 
-  Meta data for creating Debian package
+  /bin                               - User executable
+  /sbin                              - System executable
+  /libexec                           - Configuration boot trap script
+  /lib                               - Library dependencies
+  /docs                              - Documents
+  /share/zookeeper                   - Project files
 
-src/packages/deb/init.d
-  Daemon start/stop script for Debian flavor of Linux
+Command to build tarball package with native components: ant package-native tar
 
-src/packages/rpm 
-  Meta data for creating RPM package
+zookeeper-<version>-lib.tar.gz tarball file structure layout
 
-src/packages/rpm/init.d
-  Daemon start/stop script for Redhat flavor of Linux
+  /bin                               - User executable
+  /lib                               - Native libraries
+  /include/zookeeper                 - Native library headers

Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1733489&r1=1733488&r2=1733489&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Thu Mar  3 16:12:55 2016
@@ -171,17 +171,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
     <property name="cppunit.lib" value="/usr/lib"/>
     <property name="cppunit.m4" value="/usr/share/aclocal"/>
 
-    <!-- packaging property set -->
-    <property name="package.release" value="1"/>
-    <property name="package.prefix" value="/usr"/>
-    <property name="package.conf.dir" value="/etc/zookeeper"/>
-    <property name="package.log.dir" value="/var/log/zookeeper"/>
-    <property name="package.pid.dir" value="/var/run/zookeeper"/>
-    <property name="package.var.dir" value="/var/lib/zookeeper"/>
-    <property name="package.share.dir" value="/share/zookeeper"/>
-    <property name="package.buildroot" value="/tmp/zookeeper_package_build_${user.name}"/>
-    <property name="package.build.dir" value="/tmp/zookeeper_package_build_${user.name}/BUILD"/>
-
     <!-- artifact publishing property set -->
     <property name="staging_repo_id" value="apache.staging.https"/>
     <property name="wagon-http.version" value="2.4"/>
@@ -250,11 +239,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
         </fileset>
         <path refid="java.classpath"/>
     </path>
-    <path id="package.classpath">
-      <fileset dir="${ivy.package.lib}">
-        <include name="**/jdeb*.jar" />
-      </fileset>
-    </path>
 
     <!-- ====================================================== -->
     <!-- Generate and compile the Java files                    -->
@@ -836,12 +820,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
       <copy todir="${dist.dir}/share/zookeeper" includeEmptyDirs="false">
         <fileset dir="${lib.dir}">
           <exclude name="**/ivy*.jar" />
-          <exclude name="**/deb*.jar" />
         </fileset>
         <fileset dir="${ivy.lib}"/>
       </copy>
 
-      <copy file="${basedir}/src/packages/update-zookeeper-env.sh" tofile="${dist.dir}/sbin/update-zookeeper-env.sh"/>
       <subant target="package">
         <!--Pass down the version in case its needed again and the target
             distribution directory so contribs know where to install to.-->
@@ -925,16 +907,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
       <copy todir="${dist.dir}/src" includeEmptyDirs="true">
         <fileset dir="src" excludes="**/*.template **/docs/build/**/* **/ivy*.jar"/>
       </copy>
-
-      <copy todir="${dist.dir}/${package.share.dir}/templates/conf">
-        <fileset dir="src/packages/templates/conf"/>
-      </copy>
-
-      <copy file="${basedir}/conf/zoo_sample.cfg" tofile="${dist.dir}/${package.share.dir}/templates/conf/zoo.cfg" />
-      <replace file="${dist.dir}/${package.share.dir}/templates/conf/zoo.cfg">
-        <replacetoken>/tmp/zookeeper</replacetoken>
-        <replacevalue>${VAR_DIR}/data</replacevalue>
-      </replace>
   	  
       <chmod perm="ugo+x" type="file" parallel="false">
         <fileset dir="${dist.dir}/bin"/>
@@ -1030,151 +1002,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
       </subant>
     </target>
 
-    <target name="rpm" depends="package-native, tar" description="Make rpm package">
-      <!--The RPM spec file format disallows hyphen in the version.  Replace with
-          underscore to support version tags like -alpha or -SNAPSHOT.-->
-      <loadresource property="rpm.version">
-        <propertyresource name="version" />
-        <filterchain>
-          <tokenfilter>
-            <replacestring from="-" to="_" />
-          </tokenfilter>
-        </filterchain>
-      </loadresource>
-      <subant target="rpm">
-        <!--Pass down the version in case its needed again and the target
-            distribution directory so contribs know where to install to.-->
-        <property name="version" value="${version}"/>
-        <property name="rpm.version" value="${rpm.version}"/>
-        <property name="dist.dir" value="${dist.dir}"/>
-        <fileset file="${contrib.dir}/build.xml"/>
-        <fileset file="${recipes.dir}/build.xml"/>
-      </subant>  	
-      <path id="c.lib">
-        <fileset dir="${build.dir}">
-          <include name="${final.name}-lib.tar.gz"/>
-        </fileset>
-      </path>
-      <property name="c.lib" refid="c.lib"/>
-      <mkdir dir="${package.buildroot}/BUILD" />
-      <mkdir dir="${package.buildroot}/RPMS" />
-      <mkdir dir="${package.buildroot}/SRPMS" />
-      <mkdir dir="${package.buildroot}/SOURCES" />
-      <mkdir dir="${package.buildroot}/SPECS" />
-      <copy todir="${package.buildroot}/SOURCES">
-        <fileset dir="${build.dir}">
-          <include name="${final.name}.tar.gz" />
-        </fileset>
-        <fileset file="${c.lib}" />
-      </copy>
-      <copy file="${src.dir}/packages/rpm/spec/zookeeper.spec" todir="${package.buildroot}/SPECS">
-        <filterchain>
-          <replacetokens>
-            <token key="final.name" value="${final.name}" />
-            <token key="version" value="${rpm.version}" />
-            <token key="package.release" value="${package.release}" />
-            <token key="package.build.dir" value="${package.build.dir}" />
-            <token key="package.prefix" value="${package.prefix}" />
-            <token key="package.conf.dir" value="${package.conf.dir}" />
-            <token key="package.log.dir" value="${package.log.dir}" />
-            <token key="package.pid.dir" value="${package.pid.dir}" />
-            <token key="package.var.dir" value="${package.var.dir}" />
-            <token key="c.lib" value="${c.lib}" />
-          </replacetokens>
-        </filterchain>
-      </copy>
-      <rpm specFile="zookeeper.spec" command="-ba --buildroot=${package.buildroot}/BUILD" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true"
-/>
-      <copy todir="${build.dir}/" flatten="true">
-        <fileset dir="${package.buildroot}/RPMS">
-          <include name="**/${name}*.rpm" />
-        </fileset>
-        <fileset dir="${package.buildroot}/SRPMS">
-          <include name="**/${name}*.rpm" />
-        </fileset>
-      </copy>
-      <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
-    </target>
-
-    <target name="deb" depends="ivy-retrieve-package, package-native, tar" description="Make deb package">
-      <subant target="deb">
-        <!--Pass down the version in case its needed again and the target
-            distribution directory so contribs know where to install to.-->
-        <property name="version" value="${version}"/>
-        <property name="dist.dir" value="${dist.dir}"/>
-        <fileset file="${contrib.dir}/build.xml"/>
-        <fileset file="${recipes.dir}/build.xml"/>
-      </subant>
-      <taskdef name="deb" classname="org.vafer.jdeb.ant.DebAntTask">
-        <classpath refid="java.classpath"/>
-        <classpath refid="package.classpath"/>
-      </taskdef>
-
-      <mkdir dir="${package.build.dir}/zookeeper.control" />
-      <copy todir="${package.buildroot}/${package.prefix}">
-        <fileset dir="${build.dir}/${final.name}">
-          <include name="bin/**" />
-          <include name="conf/**" />
-          <include name="sbin/**" />
-          <include name="share/**" />
-        </fileset>
-      </copy>
-      <copy todir="${package.build.dir}/zookeeper.control">
-        <fileset dir="${src.dir}/packages/deb/zookeeper.control">
-          <exclude name="control" />
-        </fileset>
-      </copy>
-      <copy file="${src.dir}/packages/deb/zookeeper.control/control" todir="${package.build.dir}/zookeeper.control">
-        <filterchain>
-          <replacetokens>
-            <token key="final.name" value="${final.name}" />
-            <token key="version" value="${version}" />
-            <token key="package.release" value="${package.release}" />
-            <token key="package.build.dir" value="${package.build.dir}" />
-            <token key="package.prefix" value="${package.prefix}" />
-            <token key="package.conf.dir" value="${package.conf.dir}" />
-            <token key="package.log.dir" value="${package.log.dir}" />
-            <token key="package.pid.dir" value="${package.pid.dir}" />
-            <token key="package.var.dir" value="${package.var.dir}" />
-          </replacetokens>
-        </filterchain>
-      </copy>
-      <deb destfile="${package.buildroot}/${name}_${version}-${package.release}_${os.arch}.deb" control="${package.build.dir}/zookeeper.control">
-        <tarfileset dir="${build.dir}/${final.name}/share/zookeeper" filemode="644" prefix="${package.prefix}/share/zookeeper">
-          <include name="**" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}/${final.name}/bin" filemode="755" prefix="${package.prefix}/bin">
-          <include name="zkCli.sh" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}/${final.name}/sbin" filemode="755" prefix="${package.prefix}/sbin">
-          <include name="**.sh" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}/${final.name}/libexec" filemode="755" prefix="${package.prefix}/libexec">
-          <include name="zkEnv.sh" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}/c/build/${package.prefix}/include" prefix="${package.prefix}/include">
-          <include name="**" />
-        </tarfileset> 
-        <tarfileset dir="${build.dir}/c/build/${package.prefix}/lib" filemode="755" prefix="${package.prefix}/lib">
-          <include name="**" />
-        </tarfileset> 
-        <tarfileset dir="${build.dir}/${final.name}/conf" filemode="644" prefix="${package.conf.dir}">
-          <include name="**" />
-        </tarfileset>
-        <tarfileset dir="${build.dir}/${final.name}/src/packages/deb/init.d" filemode="755" prefix="/etc/init.d">
-          <include name="**" />
-        </tarfileset>
-      </deb>
-
-      <copy todir="${build.dir}/" flatten="true">
-        <fileset dir="${package.buildroot}">
-          <include name="**/${name}*.deb" />
-        </fileset>
-      </copy>
-      <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
-
-    </target>
-
     <!-- ====================================================== -->
     <!-- mvn-deploy. Publishing jars to nexus -->
     <!-- ====================================================== -->
@@ -1262,7 +1089,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
       <delete>
         <fileset dir="${basedir}" includes="*.jar,*.tar.gz"/>
       </delete>
-      <delete dir="${package.buildroot}" />
     </target>
 
     <target name="clean-contrib">

Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1733489&r1=1733488&r2=1733489&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Thu Mar  3 16:12:55 2016
@@ -31,7 +31,6 @@
     <conf name="test"/>
     <conf name="mvn-ant-task" visibility="private"/>
     <conf name="optional"/> <!-- optional in generated pom -->
-    <conf name="package" extends="master"/>
     <conf name="jdiff" visibility="private"/>
     <conf name="releaseaudit" visibility="private" description="Artifacts required for releaseaudit target"/>
   </configurations>
@@ -55,8 +54,6 @@
       <artifact name="netty" type="jar" conf="default"/>
     </dependency>
 
-    <dependency org="org.vafer" name="jdeb" rev="0.8" conf="package->master"/>
-
     <dependency org="junit" name="junit" rev="4.12" conf="test->default"/>
 	<dependency org="org.mockito" name="mockito-all" rev="1.8.2"
                conf="test->default"/>

Modified: zookeeper/trunk/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/build-contrib.xml?rev=1733489&r1=1733488&r2=1733489&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/build-contrib.xml (original)
+++ zookeeper/trunk/src/contrib/build-contrib.xml Thu Mar  3 16:12:55 2016
@@ -160,21 +160,6 @@
     <echo message="contrib: ${name}"/>
   </target>
 
-  <!-- ====================================================== -->
-  <!-- rpm a contrib's files                                  -->
-  <!-- ====================================================== -->
-  <target name="rpm" depends="jar" unless="skip.contrib"> 
-    <echo message="contrib: ${name}"/>
-
-  </target>
-
-  <!-- ====================================================== -->
-  <!-- deb a contrib's files                                  -->
-  <!-- ====================================================== -->
-  <target name="deb" depends="jar" unless="skip.contrib"> 
-    <echo message="contrib: ${name}"/>
-
-  </target>
   <!-- ================================================================== -->
   <!-- Clean.  Delete the build files, and their directories              -->
   <!-- ================================================================== -->

Modified: zookeeper/trunk/src/contrib/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/build.xml?rev=1733489&r1=1733488&r2=1733489&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/build.xml (original)
+++ zookeeper/trunk/src/contrib/build.xml Thu Mar  3 16:12:55 2016
@@ -67,22 +67,4 @@
       <fileset refid="contribfileset" />
     </subant>
   </target>
-
-  <!-- ====================================================== -->
-  <!-- rpm all the contribs.                                  -->
-  <!-- ====================================================== -->
-  <target name="rpm">
-    <subant target="rpm">
-      <fileset refid="contribfileset" />
-    </subant>
-  </target>
-
-  <!-- ====================================================== -->
-  <!-- deb all the contribs.                                  -->
-  <!-- ====================================================== -->
-  <target name="deb">
-    <subant target="deb">
-      <fileset refid="contribfileset" />
-    </subant>
-  </target>
 </project>

Modified: zookeeper/trunk/src/contrib/zkpython/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkpython/build.xml?rev=1733489&r1=1733488&r2=1733489&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zkpython/build.xml (original)
+++ zookeeper/trunk/src/contrib/zkpython/build.xml Thu Mar  3 16:12:55 2016
@@ -25,10 +25,6 @@
   <property name="test.log.dir" value="${build.test}/logs" />
   <property name="test.output" value="no" />
   <property name="test.timeout" value="900000" />
-  <property name="package.buildroot" value="/tmp/zkpython_build_${user.name}"/>
-  <property name="package.build.dir" value="/tmp/zkpython_build_${user.name}/BUILD"/>
-  <property name="package.release" value="1"/>
-  <property name="package.prefix" value="/usr"/>
 
   <target name="test"
           depends="compile,test-init,test-category,test-start,python-test,test-stop" />
@@ -111,88 +107,5 @@
       </exec>
     </target>
 
-    <target name="rpm" depends="tar-bin" unless="skip.contrib">
-      <mkdir dir="${package.buildroot}/BUILD" />
-      <mkdir dir="${package.buildroot}/RPMS" />
-      <mkdir dir="${package.buildroot}/SRPMS" />
-      <mkdir dir="${package.buildroot}/SOURCES" />
-      <mkdir dir="${package.buildroot}/SPECS" />
-      <copy todir="${package.buildroot}/SOURCES">
-        <fileset dir="${build.dir}/dist">
-          <include name="*.tar.gz" />
-        </fileset>
-      </copy>
-      <path id="python.lib">
-        <fileset dir="${package.buildroot}/SOURCES">
-          <include name="*.tar.gz" />
-        </fileset>
-      </path>
-      <property name="python.lib" refid="python.lib" />
-      <copy file="${src.dir}/../packages/rpm/spec/${name}.spec" todir="${package.buildroot}/SPECS">
-        <filterchain>
-          <replacetokens>
-            <token key="final.name" value="${name}" />
-            <token key="version" value="${rpm.version}" />
-            <token key="package.release" value="${package.release}" />
-            <token key="package.build.dir" value="${package.build.dir}" />
-            <token key="package.prefix" value="${package.prefix}" />
-            <token key="python.lib" value="${python.lib}" />
-          </replacetokens>
-        </filterchain>
-      </copy>
-
-      <rpm specFile="${name}.spec" command="-ba --buildroot=${package.buildroot}/BUILD" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true" />
-      <copy todir="${build.dir}/" flatten="true">
-        <fileset dir="${package.buildroot}/RPMS">
-          <include name="**/*.rpm" />
-        </fileset>
-      </copy>
-      <delete dir="${package.buildroot}" quiet="true" verbose="false" />
-    </target>
-
-    <target name="deb" depends="tar-bin" unless="skip.contrib">
-      <mkdir dir="${package.buildroot}" />
-      <mkdir dir="${package.buildroot}/BUILD" />
-      <mkdir dir="${package.buildroot}/SPECS" />
-      <copy todir="${package.buildroot}/SOURCES">
-        <fileset dir="${build.dir}/dist">
-          <include name="*.tar.gz" />
-        </fileset>
-      </copy>
-      <path id="python.lib">
-        <fileset dir="${package.buildroot}/SOURCES">
-          <include name="*.tar.gz" />
-        </fileset>
-      </path>
-      <property name="python.lib" refid="python.lib" />
-      <copy todir="${package.build.dir}/zkpython.control">
-        <fileset dir="${src.dir}/../packages/deb/zkpython.control">
-          <exclude name="control" />
-        </fileset>
-      </copy>
-      <copy file="${src.dir}/../packages/deb/zkpython.control/control" todir="${package.build.dir}/zkpython.control">
-        <filterchain>
-          <replacetokens>
-            <token key="final.name" value="${name}" />
-            <token key="version" value="${version}" />
-            <token key="package.release" value="${package.release}" />
-            <token key="package.build.dir" value="${package.build.dir}" />
-            <token key="package.prefix" value="${package.prefix}" />
-          </replacetokens>
-        </filterchain>
-      </copy>
-      <taskdef name="deb" classname="org.vafer.jdeb.ant.DebAntTask">
-        <classpath refid="classpath"/>
-      </taskdef>
-      <deb destfile="${package.buildroot}/${name}_${version}-${package.release}_${os.arch}.deb" control="${package.build.dir}/zkpython.control">
-        <data src="${python.lib}" />
-      </deb>
-      <copy todir="${build.dir}/" flatten="true">
-        <fileset dir="${package.buildroot}">
-          <include name="**/${name}_*.deb" />
-        </fileset>
-      </copy>
-      <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
-    </target>
 </project>
 

Modified: zookeeper/trunk/src/contrib/zkpython/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkpython/ivy.xml?rev=1733489&r1=1733488&r2=1733489&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zkpython/ivy.xml (original)
+++ zookeeper/trunk/src/contrib/zkpython/ivy.xml Thu Mar  3 16:12:55 2016
@@ -32,12 +32,4 @@
     <conf name="releaseaudit" visibility="private" description="Artifacts required for releaseaudit target"/>
   </configurations>
 
-  <dependencies>
-
-    <dependency org="org.vafer" name="jdeb" rev="0.8">
-      <artifact name="jdeb" type="jar" conf="default"/>
-    </dependency>
-
-  </dependencies>
-
 </ivy-module>

Modified: zookeeper/trunk/src/recipes/build-recipes.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/build-recipes.xml?rev=1733489&r1=1733488&r2=1733489&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/build-recipes.xml (original)
+++ zookeeper/trunk/src/recipes/build-recipes.xml Thu Mar  3 16:12:55 2016
@@ -139,22 +139,6 @@
     <delete dir="${build.dir}"/>
   </target>
 
-  <!-- ====================================================== -->
-  <!-- rpm a contrib's files                                  -->
-  <!-- ====================================================== -->
-  <target name="rpm" depends="jar" unless="skip.contrib">
-    <echo message="recipes: ${name}"/>
-
-  </target>
-
-  <!-- ====================================================== -->
-  <!-- deb a contrib's files                                  -->
-  <!-- ====================================================== -->
-  <target name="deb" depends="jar" unless="skip.contrib">
-    <echo message="recipes: ${name}"/>
-
-  </target>
-
   <!-- ================================================================== -->
   <!-- Utility features                                                   -->
   <!-- ================================================================== -->

Modified: zookeeper/trunk/src/recipes/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/build.xml?rev=1733489&r1=1733488&r2=1733489&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/build.xml (original)
+++ zookeeper/trunk/src/recipes/build.xml Thu Mar  3 16:12:55 2016
@@ -58,22 +58,4 @@
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>
-
-  <!-- ====================================================== -->
-  <!-- rpm all the contribs.                                  -->
-  <!-- ====================================================== -->
-  <target name="rpm">
-    <subant target="rpm">
-      <fileset dir="." includes="*/build.xml"/>
-    </subant>
-  </target>
-
-  <!-- ====================================================== -->
-  <!-- deb all the contribs.                                  -->
-  <!-- ====================================================== -->
-  <target name="deb">
-    <subant target="deb">
-      <fileset dir="." includes="*/build.xml"/>
-    </subant>
-  </target>
 </project>