diff --git a/build.xml b/build.xml
index 8562000..7975f13 100644
--- a/build.xml
+++ b/build.xml
@@ -257,7 +257,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
         <mkdir dir="${ivy.package.lib}"/>
         <mkdir dir="${ivy.test.lib}"/>
         <condition property="ivy.jar.exists">
-          <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
+          <available file="/usr/share/java/ivy.jar"/>
         </condition>
 
         <tstamp>
@@ -343,9 +343,9 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
     
     <target name="ivy-download" unless="ivy.jar.exists" depends="init">
       <delete dir="${lib.dir}"
-              includes="ivy-*.jar" excludes="ivy-${ivy.version}.jar"/>
-      <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar"
-           dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
+              includes="ivy.jar" excludes="ivy.jar"/>
+      <get src="${ivy.url}/ivy.jar"
+           dest="${lib.dir}/ivy.jar" usetimestamp="true"/>
     </target>
 
     <target name="ivy-taskdef" unless="ivy.initialized">
diff --git a/ivy.xml b/ivy.xml
index 95b0e5a..0ea5c4d 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -46,10 +46,10 @@
     <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"/>
     <!-- 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="0.9.94" transitive="false" conf="default"/>
+    <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="default"/>
+    <dependency org="jline" name="jline" rev="1.0" transitive="false" conf="default"/>
 
-    <dependency org="io.netty" name="netty" conf="default" rev="3.10.5.Final">
+    <dependency org="io.netty" name="netty" conf="default" rev="3.9.3.Final">
       <artifact name="netty" type="jar" conf="default"/>
     </dependency>
 
@@ -58,14 +58,14 @@
     <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
      <dependency org="org.mockito" name="mockito-all" rev="1.8.2"
                conf="test->default"/>
-    <dependency org="checkstyle" name="checkstyle" rev="5.0"
+    <dependency org="com.puppycrawl.tools" name="checkstyle" rev="5.6"
                 conf="test->default"/>
     <dependency org="commons-collections" name="commons-collections" 
                 rev="3.2.2" conf="test->default"/>
 
-    <dependency org="jdiff" name="jdiff" rev="1.0.9"
+    <dependency org="jdiff" name="jdiff" rev="1.1.1"
                 conf="jdiff->default"/>
-    <dependency org="xerces" name="xerces" rev="1.4.4"
+    <dependency org="xerces" name="xercesImpl" rev="1.4.4"
                 conf="jdiff->default"/>
 
     <dependency org="org.apache.rat" name="apache-rat-tasks" 
diff --git a/ivysettings.xml b/ivysettings.xml
index 52cfa52..595dd4c 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -17,29 +17,14 @@
    limitations under the License.
 -->
 
-  <property name="repo.maven.org"
-    value="http://repo1.maven.org/maven2/" override="false"/>
-  <property name="repo.jboss.org"
-    value="http://repository.jboss.org/nexus/content/groups/public/" override="false"/>
-  <property name="repo.sun.org"
-    value="http://download.java.net/maven/2/" override="false"/>
-  <property name="maven2.pattern"
-    value="[organisation]/[module]/[revision]/[module]-[revision]"/>
-  <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
   <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
   <settings defaultResolver="default"/>
+  <typedef name="xmvn" classname="org.fedoraproject.xmvn.connector.ivy.IvyResolver"/>
   <resolvers>
-    <ibiblio name="maven2" root="${repo.maven.org}"
-      pattern="${maven2.pattern.ext}" m2compatible="true"/>
-    <ibiblio name="jboss-maven2" root="${repo.jboss.org}"
-      pattern="${maven2.pattern.ext}" m2compatible="true"/>
-    <ibiblio name="sun-maven2" root="${repo.sun.org}"
-      pattern="${maven2.pattern.ext}" m2compatible="true"/>
+    <xmvn name="XMvn"/>
 
     <chain name="default" dual="true">
-      <resolver ref="maven2"/>
-      <resolver ref="jboss-maven2"/>
-      <resolver ref="sun-maven2"/>
+      <resolver ref="XMvn"/>
     </chain>
 
   </resolvers>
diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml
index fab8a5f..80518a8 100644
--- a/src/contrib/build-contrib.xml
+++ b/src/contrib/build-contrib.xml
@@ -103,7 +103,7 @@
     <mkdir dir="${ivy.lib}"/>
     <mkdir dir="${ivy.test.lib}"/>
     <condition property="ivy.jar.exists">
-      <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
+      <available file="/usr/share/java/ivy.jar"/>
     </condition>
 
     <antcall target="init-contrib"/>
@@ -219,9 +219,9 @@
   <!-- ====================================================== -->
   <target name="ivy-download" unless="ivy.jar.exists" depends="init">
     <delete dir="${lib.dir}"
-            includes="ivy-*.jar" excludes="ivy-${ivy.version}.jar"/>
-    <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar"
-         dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
+            includes="ivy.jar" excludes="ivy.jar"/>
+    <get src="${ivy.url}/ivy.jar"
+         dest="${lib.dir}/ivy.jar" usetimestamp="true"/>
   </target>
 
   <target name="ivy-init" depends="ivy-download" unless="ivy.initialized">
diff --git a/src/contrib/build.xml b/src/contrib/build.xml
index 7f7ba4f..701dfea 100644
--- a/src/contrib/build.xml
+++ b/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="rest/build.xml" />
 
   <fileset id="contribfileset" dir=".">
     <include name="${contribfilesetincludes}"/>
diff --git a/src/contrib/rest/build.xml b/src/contrib/rest/build.xml
deleted file mode 100644
index fb628bc..0000000
--- a/src/contrib/rest/build.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<project name="rest" default="jar">
-  <import file="../build-contrib.xml"/>
-
-	<property name="test.build.dir" value="${build.test}" />
-    <property name="test.src.dir" value="src/test"/>
-    <property name="test.log.dir" value="${test.build.dir}/logs" />
-    <property name="test.data.dir" value="${test.build.dir}/data" />
-    <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
-    <property name="test.tmp.dir" value="${test.build.dir}/tmp" />
-    <property name="test.output" value="no" />
-    <property name="test.timeout" value="900000" />
-    <property name="test.junit.output.format" value="plain" />
-    <property name="test.junit.fork.mode" value="perTest" />
-    <property name="test.junit.printsummary" value="yes" />
-    <property name="test.junit.haltonfailure" value="no" />
-    <property name="test.junit.maxmem" value="512m" />
-
-    <!-- ====================================================== -->
-    <!-- Macro definitions                                      -->
-    <!-- ====================================================== -->
-    <macrodef name="macro_tar" description="Worker Macro for tar">
-      <attribute name="param.destfile"/>
-      <element name="param.listofitems"/>
-      <sequential>
-        <tar compression="gzip" longfile="gnu"
-             destfile="@{param.destfile}">
-          <param.listofitems/>
-        </tar>
-      </sequential>
-    </macrodef>
-
-  <target name="package" depends="jar" unless="skip.contrib">
-    <echo message="contrib: ${name}"/>
-    <mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
-    <copy todir="${dist.dir}${package.share}/contrib/${name}">
-      <fileset dir="${build.dir}">
-        <include name="zookeeper-${version}-${name}.jar" />
-      </fileset>
-    </copy>
-    <copy todir="${dist.dir}${package.share}/contrib/${name}/lib">
-      <fileset dir="${build.dir}/lib" />
-    </copy>
-    <copy todir="${dist.dir}${package.share}/contrib/${name}/conf">
-      <fileset dir="conf" />
-    </copy>
-  </target>
-
-  <target name="setjarname">
-    <property name="jarname"
-              value="${build.dir}/zookeeper-${version}-${name}.jar"/>
-  </target>
-
-  <target name="compile" depends="ivy-retrieve,zookeeperbuildcontrib.compile"/>
-
-  <target name="test"
-          depends="compile-test,test-init,test-category,test-start,junit.run,test-stop" />
-
-	<target name="compile-test" depends="ivy-retrieve-test,compile">
-  		<property name="target.jdk" value="${ant.java.version}" />	
-		<property name="src.test.local" location="${basedir}/src/test" />
-		<mkdir dir="${build.test}"/>
-		<javac srcdir="${src.test.local}" 
-			destdir="${build.test}" 
-			target="${target.jdk}" 
-			debug="on" >
-			<classpath refid="classpath" />
-		</javac>
-	</target>
-	
-    <target name="test-init" depends="jar,compile-test">
-        <delete dir="${test.log.dir}" />
-        <delete dir="${test.tmp.dir}" />
-        <delete dir="${test.data.dir}" />
-        <mkdir dir="${test.log.dir}" />
-        <mkdir dir="${test.tmp.dir}" />
-        <mkdir dir="${test.data.dir}" />
-    </target>
-
-    <target name="test-start">
-      <exec executable="${test.src.dir}/zkServer.sh">
-        <arg value="startClean"/>
-      </exec>
-    </target>
-
-    <target name="test-stop">
-      <exec executable="${test.src.dir}/zkServer.sh">
-        <arg value="stop"/>
-      </exec>
-    </target>
-
-	<target name="test-category">
-         <property name="test.category" value=""/>
-    </target>
-
-	<target name="junit.run">
-		<echo message="${test.src.dir}" />
-        <junit showoutput="${test.output}"
-               printsummary="${test.junit.printsummary}"
-               haltonfailure="${test.junit.haltonfailure}"
-               fork="yes"
-               forkmode="${test.junit.fork.mode}"
-               maxmemory="${test.junit.maxmem}"
-               dir="${basedir}" timeout="${test.timeout}"
-               errorProperty="tests.failed" failureProperty="tests.failed">
-          <sysproperty key="build.test.dir" value="${test.tmp.dir}" />
-          <sysproperty key="test.data.dir" value="${test.data.dir}" />
-          <sysproperty key="log4j.configuration"
-                    value="file:${basedir}/conf/log4j.properties" />
-          <classpath refid="classpath"/>
-          <classpath>
-             <pathelement path="${build.test}" />
-          </classpath>
-          <formatter type="${test.junit.output.format}" />
-          <batchtest todir="${test.log.dir}" unless="testcase">
-              <fileset dir="${test.src.dir}"
-                     includes="**/*${test.category}Test.java"/>
-          </batchtest>
-          <batchtest todir="${test.log.dir}" if="testcase">
-              <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
-          </batchtest>
-       </junit>
-       <fail if="tests.failed">Tests failed!</fail>
-    </target>
-
-  <target name="jar" depends="checkMainCompiled, setjarname, compile">
-    <echo message="contrib: ${name}"/>
-    <jar jarfile="${jarname}">
-      <fileset file="${zk.root}/LICENSE.txt" />
-      <fileset dir="${build.classes}"/>
-      <fileset dir="${build.test}"/>
-    </jar>
-  </target>
-
-  <target name="run" depends="jar">
-    <echo message="contrib: ${name}"/>
-    <java classname="org.apache.zookeeper.server.jersey.RestMain" fork="true">
-      <classpath>
-        <pathelement path="${jarname}" />
-        <fileset dir="${build.dir}/lib" includes="*.jar"/>
-        <fileset dir="${zk.root}/build" includes="zookeeper-*.jar"/>
-        <pathelement path="${zk.root}/src/contrib/${name}/conf" />
-        <fileset dir="${zk.root}/src/java/lib">
-          <include name="**/*.jar" />
-        </fileset>
-      </classpath>
-    </java>
-  </target>
-
-  <target name="tar" depends="clean, jar">
-    <echo message="building tar.gz: ${name}" />
-    <macro_tar param.destfile="${build.dir}/zookeeper-${version}-${name}.tar.gz">
-      <param.listofitems>
-        <tarfileset dir="${build.dir}/lib" prefix="lib" includes="**/*.jar" />
-        <tarfileset file="${build.dir}/zookeeper-*-rest.jar" />
-        <tarfileset dir="${zk.root}/build" includes="zookeeper-*.jar" prefix="lib" />
-        <tarfileset dir="${zk.root}/src/contrib/${name}/conf" prefix="conf" />
-        <tarfileset dir="${zk.root}/src/java/lib" prefix="lib" includes="**/*.jar" />
-        <tarfileset file="${zk.root}/src/contrib/${name}/rest.sh" />
-      </param.listofitems>
-    </macro_tar>
-  </target>
-
-</project>
-
diff --git a/src/contrib/rest/ivy.xml b/src/contrib/rest/ivy.xml
deleted file mode 100644
index 903d390..0000000
--- a/src/contrib/rest/ivy.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<ivy-module version="2.0"
-            xmlns:e="http://ant.apache.org/ivy/extra">
-
-  <info organisation="org.apache.zookeeper"
-        module="${name}" revision="${version}">
-    <license name="Apache 2.0"/>
-    <ivyauthor name="Apache ZooKeeper" url="http://zookeeper.apache.org"/>
-    <description>ZooKeeper REST</description>
-  </info>
-
-  <configurations defaultconfmapping="default">
-    <conf name="default"/>
-    <conf name="test"/>
-  </configurations>
-
-  <dependencies>
-    <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
-    <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
-  
-    <!-- transitive false turns off dependency checking, log4j deps seem borked -->
-    <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
-    <dependency org="asm" name="asm" rev="3.1" />
-    <dependency org="com.sun.grizzly" name="grizzly-servlet-webserver" rev="1.9.8" />
-    <dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" />
-    <dependency org="com.sun.jersey" name="jersey-json" rev="1.1.5.1" />
-
-    <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
-    <dependency org="com.sun.jersey" name="jersey-client" rev="1.1.5.1" conf="test->default"/>
-  </dependencies>
-
-</ivy-module>
diff --git a/src/contrib/loggraph/ivy.xml b/src/contrib/loggraph/ivy.xml
index d6fa9d6..fdcc35f 100644
--- a/src/contrib/loggraph/ivy.xml
+++ b/src/contrib/loggraph/ivy.xml
@@ -35,7 +35,7 @@
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
   
     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
-    <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
+    <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
     <dependency org="org.eclipse.jetty" name="jetty-server" rev="7.0.1.v20091125" />
     <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="7.0.1.v20091125" />
     <dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1" />
diff --git a/src/contrib/zooinspector/ivy.xml b/src/contrib/zooinspector/ivy.xml
index bc02946..cb4061f 100644
--- a/src/contrib/zooinspector/ivy.xml
+++ b/src/contrib/zooinspector/ivy.xml
@@ -35,7 +35,7 @@
     <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
             
-    <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
+    <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
     <dependency org="junit" name="junit" rev="4.7" conf="test->default"/>
         <dependency org="org.apache.rat" name="apache-rat-tasks" 
                 rev="0.6" conf="releaseaudit->default"/>