From: Markus Koschany <apo@debian.org>
Date: Thu, 24 May 2018 14:44:40 +0200
Subject: patch build system

Build without ivy and do not download jars from the internet at build time.
---
 build.xml                          | 53 ++++++++++++--------------------------
 src/contrib/build-contrib.xml      | 33 +++++++-----------------
 src/contrib/zooinspector/build.xml |  5 ++--
 3 files changed, 28 insertions(+), 63 deletions(-)

diff --git a/build.xml b/build.xml
index 6c05885..c71f166 100644
--- a/build.xml
+++ b/build.xml
@@ -31,7 +31,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
     <property environment="env"/>
     
     <property name="version" value="3.4.9" />
-    <property name="final.name" value="${name}-${version}"/>
+    <property name="final.name" value="${name}"/>
     <property name="revision.dir" value="${basedir}/.revision" />
     <property name="revision.properties" value="revision.properties" />
     <property file="${basedir}/src/java/${revision.properties}" />
@@ -217,27 +217,21 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
     <path id="java.classpath">
       <pathelement location="${build.classes}"/>
       <!-- allow the user to override (e.g. if there are local versions) -->
-      <fileset dir="${additional.lib.dir}">
-        <include name="${additional.lib.dir.includes}" />
-        <exclude name="${additional.lib.dir.excludes}" />
+      <fileset dir="/usr/share/java">
+        <include name="log4j-1.2.jar" />
+        <include name="jline.jar" />
+        <include name="xercesImpl.jar" />
+        <include name="slf4j-api.jar" />
+        <include name="slf4j-log4j12.jar" />
+        <include name="netty-3.9.0.Final.jar" />
       </fileset>
-      <fileset dir="${lib.dir}">
-        <include name="${lib.dir.includes}" />
-        <exclude name="${lib.dir.excludes}" />
-      </fileset>
-      <fileset dir="${ant.home}/lib">
-        <include name="ant.jar" />
-      </fileset>
-      <fileset dir="${ivy.lib}">
-        <include name="**/*.jar" />
-      </fileset>
-      <pathelement path="${clover.jar}" />
     </path>
 
     <path id="test.java.classpath">
       <pathelement location="${test.java.classes}" />
-      <fileset dir="${ivy.test.lib}">
-        <include name="**/*.jar" />
+      <fileset dir="/usr/share/java">
+        <include name="junit4.jar" />
+        <include name="mockito-core.jar" />
       </fileset>
       <path refid="java.classpath"/>
     </path>
@@ -279,7 +273,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
                   targetfile="${src_generated.dir}/.generated"/>
     </target>
 
-    <target name="compile_jute" depends="jute,compile_jute_uptodate" unless="juteBuild.notRequired">
+    <target name="compile_jute" depends="jute,compile_jute_uptodate" unless="">
         <mkdir dir="${src_generated.dir}" />
         <mkdir dir="${csrc_generated.dir}" />
         <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${src_generated.dir}">
@@ -392,7 +386,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
                     pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
       <ivy:cachepath pathid="mvn-ant-task-classpath" conf="mvn-ant-task"/>
     </target>
-    <target name="compile" depends="ivy-retrieve,clover,build-generated">
+    <target name="compile" depends="build-generated">
         <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
                target="${javac.target}" source="${javac.source}" debug="on">
             <classpath refid="java.classpath"/>
@@ -401,7 +395,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
         </javac>
     </target>
 
-    <target name="compile-test" depends="ivy-retrieve-test,compile">
+    <target name="compile-test" depends="compile">
       <mkdir dir="${test.java.classes}"/>
       <javac srcdir="${test.src.dir}" destdir="${test.java.classes}" includeantruntime="false"
              target="${javac.target}" source="${javac.source}" debug="on">
@@ -1229,26 +1223,10 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
     <target name="test-init" depends="jar,compile-test">
         <delete dir="${test.log.dir}" />
         <delete dir="${test.tmp.dir}" />
-        <delete dir="${test.data.upgrade.dir}" />
-        <delete dir="${test.data.invalid.dir}" />
-        <delete dir="${test.data.buffersize.dir}" />
         <delete dir="${test.data.dir}" />
         <mkdir dir="${test.log.dir}" />
         <mkdir dir="${test.tmp.dir}" />
         <mkdir dir="${test.data.dir}" />
-        <mkdir dir="${test.data.upgrade.dir}" />
-        <mkdir dir="${test.data.invalid.dir}" />
-        <copy todir="${test.data.upgrade.dir}">
-            <fileset dir="${basedir}/src/java/test/data/upgrade"/>
-        </copy>
-        <copy todir="${test.data.invalid.dir}">
-            <fileset dir="${basedir}/src/java/test/data/invalidsnap"/>
-        </copy>
-        <mkdir dir="${test.data.buffersize.dir}" />
-        <copy todir="${test.data.buffersize.dir}">
-            <fileset dir="${basedir}/src/java/test/data/buffersize"/>
-        </copy>
-       
     </target>
 
     <condition property="quicktest">
@@ -1301,6 +1279,9 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
           <batchtest todir="${test.log.dir}" if="fulltest">
             <fileset dir="${test.src.dir}">
               <include name="**/*${test.category}Test.java"/>
+              <exclude name="**/test/UpgradeTest.java"/>
+              <exclude name="**/test/InvalidSnapshotTest.java"/>
+              <exclude name="**/VerGenTest.java"/>
             </fileset>
           </batchtest>
           <batchtest todir="${test.log.dir}" if="testcase">
diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml
index fab8a5f..27fb32f 100644
--- a/src/contrib/build-contrib.xml
+++ b/src/contrib/build-contrib.xml
@@ -70,25 +70,16 @@
 
   <path id="classpath">
     <pathelement location="${build.classes}"/>
-    <!-- allow the user to override (e.g. if there are local versions) -->
-    <fileset dir="${additional.lib.dir}">
-      <include name="${additional.lib.dir.includes}" />
-      <exclude name="${additional.lib.dir.excludes}" />
+    <fileset dir="/usr/share/java">
+      <include name="log4j-1.2.jar" />
+      <include name="jline.jar" />
+      <include name="xercesImpl.jar" />
+      <include name="netty.jar-3.9.0.Final" />
+      <include name="slf4j-api.jar" />
+      <include name="slf4j-log4j12.jar" />
     </fileset>
-    <fileset refid="lib.jars"/>
+    <!-- allow the user to override (e.g. if there are local versions) -->
     <pathelement location="${zk.root}/build/classes"/>
-    <fileset dir="${ivy.lib}">
-      <include name="**/*.jar" />
-    </fileset>
-    <fileset dir="${ivy.test.lib}">
-      <include name="**/*.jar" />
-    </fileset>
-    <fileset dir="${zk.root}/src/java/lib">
-      <include name="**/*.jar" />
-    </fileset>
-    <fileset dir="${ant.home}/lib">
-      <include name="ant.jar" />
-    </fileset>
   </path>
 
   <!-- ====================================================== -->
@@ -133,7 +124,7 @@
   <target name="jar" depends="compile" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
     <jar
-      jarfile="${build.dir}/zookeeper-${version}-${name}.jar"
+      jarfile="${build.dir}/zookeeper-${name}.jar"
       basedir="${build.classes}"      
     />
   </target>
@@ -233,15 +224,9 @@
   </target>
 
   <target name="ivy-retrieve" depends="init,ivy-init">
-    <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="default"
-                  pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
-    <ivy:retrieve settingsRef="${ant.project.name}" type="bundle" conf="default"
-  				  pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
   </target>
 
   <target name="ivy-retrieve-test" depends="init,ivy-init">
-    <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="test"
-                  pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
   </target>
 
 
diff --git a/src/contrib/zooinspector/build.xml b/src/contrib/zooinspector/build.xml
index a242790..c3a55d1 100644
--- a/src/contrib/zooinspector/build.xml
+++ b/src/contrib/zooinspector/build.xml
@@ -20,7 +20,7 @@
 
 
 	<target name="setjarname">
-		<property name="jarname" value="${build.dir}/zookeeper-${version}-${name}.jar" />
+		<property name="jarname" value="${build.dir}/zookeeper-${name}.jar" />
 	</target>
 
 	<target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init">
@@ -41,7 +41,7 @@
 			<fileset file="${basedir}/lib/log4j.properties" />
 		</copy>
 		<copy todir="${build.dir}/lib">
-			<fileset file="../../../build/zookeeper-3.3.0.jar" />
+			<fileset file="../../../build/zookeeper.jar" />
 		</copy>
 		<copy todir="${build.dir}">
 			<fileset dir="${basedir}" includes="*.*" excludes="build.xml,ivy.xml" />
@@ -55,7 +55,6 @@
 		<jar jarfile="${jarname}">
 			<manifest>
 				<attribute name="Main-Class" value="org.apache.zookeeper.inspector.ZooInspector" />
-				<attribute name="Class-Path" value="lib/log4j-1.2.15.jar lib/TableLayout-20050920.jar lib/zookeeper-3.3.0.jar lib/jToaster-1.0.4.jar lib" />
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Built-At" value="${build.time}" />
 				<attribute name="Built-On" value="${host.name}" />