NOTICE.txt

 Apache ZooKeeper
-Copyright 2009-2017 The Apache Software Foundation
+Copyright 2009-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

bin/zkEnv.cmd

@@ -46,4 +46,7 @@ if not exist "%JAVA_HOME%"\bin\java.exe (
   goto :eof
 )
 
+REM strip off trailing \ from JAVA_HOME or java does not start
+if "%JAVA_HOME:~-1%" EQU "\" set "JAVA_HOME=%JAVA_HOME:~0,-1%"
+ 
 set JAVA="%JAVA_HOME%"\bin\java

build.xml

@@ -31,7 +31,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
     <property environment="env"/>
     
-    <property name="version" value="3.4.10" />
+    <property name="version" value="3.4.12" />
     <property name="final.name" value="${name}-${version}"/>
     <property name="revision.dir" value="${basedir}/.revision" />
     <property name="revision.properties" value="revision.properties" />
@@ -116,6 +116,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <property name="ivy.package.lib" value="${build.dir}/package/lib"/>
     <property name="ivy.test.lib" value="${build.dir}/test/lib"/>
     <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
+    <property name="ivy.releaseaudit.lib" value="${build.dir}/releaseaudit/lib"/>
+    <property name="ivy.owasp.lib" value="${build.dir}/owasp/lib"/>
     <property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
 
     <property name="mvnrepo" value="https://repo1.maven.org/maven2"/>
@@ -202,6 +204,39 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <property name="sources-jar" value="${dist.maven.dir}/${final.name}-sources.jar"/>
     <property name="javadoc-jar" value="${dist.maven.dir}/${final.name}-javadoc.jar"/>
 
+    <!-- ====================================================== -->
+    <!-- Dependency versions                                    -->
+    <!-- ====================================================== -->
+    <property name="slf4j.version" value="1.7.25"/>
+
+    <property name="wagon-http.version" value="2.4"/>
+    <property name="maven-ant-tasks.version" value="2.1.3"/>
+    <property name="log4j.version" value="1.2.17"/>
+    <property name="jline.version" value="0.9.94"/>
+
+    <property name="jdeb.version" value="0.8"/>
+
+    <property name="audience-annotations.version" value="0.5.0" />
+
+    <property name="netty.version" value="3.10.6.Final"/>
+
+    <property name="junit.version" value="4.8.1"/>
+    <property name="mockito.version" value="1.8.5"/>
+    <property name="checkstyle.version" value="6.1.1"/>
+    <property name="commons-collections.version" value="3.2.2"/>
+    <property name="commons-io.version" value="2.4"/>
+
+    <property name="apache-directory-server.version" value="2.0.0-M15"/>
+    <property name="apache-directory-api.version" value="1.0.0-M20"/>
+
+    <property name="jdiff.version" value="1.0.9"/>
+    <property name="xerces.version" value="1.4.4"/>
+
+    <property name="apache-rat-tasks.version" value="0.6"/>
+    <property name="commons-lang.version" value="2.4"/>
+
+    <property name="dependency-check-ant.version" value="2.1.0"/>
+
     <!-- ====================================================== -->
     <!-- Macro definitions                                      -->
     <!-- ====================================================== -->
@@ -216,8 +251,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
       </sequential>
     </macrodef>
 
-    <!-- the normal classpath -->
-    <path id="java.classpath">
+    <path id="base.classpath">
       <pathelement location="${build.classes}"/>
       <!-- allow the user to override (e.g. if there are local versions) -->
       <fileset dir="${additional.lib.dir}">
@@ -231,18 +265,23 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
       <fileset dir="${ant.home}/lib">
           <include name="ant.jar" />
       </fileset>
+      <pathelement path="${clover.jar}" />
+    </path>
+
+    <!-- the normal classpath -->
+    <path id="java.classpath">
+      <path refid="base.classpath"/>
       <fileset dir="${ivy.lib}">
         <include name="**/*.jar" />
       </fileset>
-      <pathelement path="${clover.jar}" />
     </path>
 
     <path id="test.java.classpath">
+      <path refid="base.classpath"/>
       <pathelement location="${test.java.classes}" />
       <fileset dir="${ivy.test.lib}">
         <include name="**/*.jar" />
       </fileset>
-      <path refid="java.classpath"/>
     </path>
 
     <path id="package.classpath">
@@ -273,7 +312,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <target name="jute" depends="init">
         <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
             target="${javac.target}" source="${javac.source}"
-            includes="org/apache/jute/**" debug="on" />
+            includes="org/apache/jute/**" debug="on" classpath="${ivy.lib}/audience-annotations-${audience-annotations.version}.jar" />
     </target>
 
     <target name="compile_jute_uptodate">
@@ -340,9 +379,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         </java>
     </target>
     
-    <target name="build-generated" depends="compile_jute,version-info" >
+    <target name="build-generated" depends="compile_jute,version-info,ivy-retrieve" >
         <javac srcdir="${src_generated.dir}" destdir="${build.classes}" includeantruntime="false"
-            target="${javac.target}" source="${javac.source}" debug="on" />
+            target="${javac.target}" source="${javac.source}" debug="on" classpath="${ivy.lib}/audience-annotations-${audience-annotations.version}.jar" />
     </target>
     
     <target name="ivy-download" unless="ivy.jar.exists" depends="init">
@@ -386,15 +425,27 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
     <target name="ivy-retrieve-releaseaudit" depends="init,ivy-init">
       <ivy:retrieve settingsRef="${ant.project.name}" conf="releaseaudit"
-                    pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+                    pattern="${ivy.releaseaudit.lib}/[artifact]-[revision].[ext]"/>
       <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
     </target>
 
+    <target name="ivy-retrieve-owasp" depends="init,ivy-init">
+        <ivy:retrieve settingsRef="${ant.project.name}" conf="owasp"
+                      pattern="${ivy.owasp.lib}/[artifact]-[revision].[ext]"/>
+        <ivy:cachepath pathid="owasp-classpath" conf="owasp"/>
+    </target>
+
     <target name="ivy-retrieve-mvn-ant-task" depends="init,ivy-init">
       <ivy:retrieve settingsRef="${ant.project.name}" conf="mvn-ant-task"
                     pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
       <ivy:cachepath pathid="mvn-ant-task-classpath" conf="mvn-ant-task"/>
     </target>
+
+    <target name="dependency-report" depends="init,ivy-init">
+        <ivy:resolve conf="*"/>
+        <ivy:report conf="*" todir="${build.dir}/dependency-report"/>
+    </target>
+
     <target name="compile" depends="ivy-retrieve,clover,build-generated">
         <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
                target="${javac.target}" source="${javac.source}" debug="on">
@@ -498,23 +549,24 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
          windowtitle="${Name} ${version} API"
          doctitle="${Name} ${version} API"
          bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
+         doclet="org.apache.yetus.audience.tools.IncludePublicAnnotationsStandardDoclet"
+         docletpath="${ivy.lib}/audience-annotations-${audience-annotations.version}.jar"
          >
+
         <fileset dir="${java.src.dir}">
-          <include name="org/apache/**/*Main.java"/>
-          <include name="org/apache/zookeeper/AsyncCallback.java"/>
-          <include name="org/apache/zookeeper/CreateMode.java"/>
-          <include name="org/apache/zookeeper/KeeperException.java"/>
-          <include name="org/apache/zookeeper/ServerAdminClient.java"/>
-          <include name="org/apache/zookeeper/Watcher.java"/>
-          <include name="org/apache/zookeeper/WatchedEvent.java"/>
-          <include name="org/apache/zookeeper/ZooDefs.java"/>
-          <include name="org/apache/zookeeper/ZooKeeper.java"/>
+          <include name="org/apache/zookeeper/server/quorum/QuorumPeerMain.java"/>
+          <include name="org/apache/zookeeper/server/ZooKeeperServerMain.java"/>
           <include name="org/apache/zookeeper/server/LogFormatter.java"/>
-          <include name="org/apache/zookeeper/server/SnapshotFormatter.java"/>
           <include name="org/apache/zookeeper/server/PurgeTxnLog.java"/>
-          <exclude name="org/apache/zookeeper/server/quorum/QuorumPacket"/>
+          <include name="org/apache/zookeeper/server/SnapshotFormatter.java"/>
+          <include name="org/apache/zookeeper/server/upgrade/UpgradeMain.java"/>
         </fileset>
+    	<packageset dir="${java.src.dir}">
+          <include name="org/apache/**"/>
+          <exclude name="org/apache/zookeeper/server/**"/>
+    	</packageset>
     	<packageset dir="${src_generated.dir}">
+          <include name="org/apache/**"/>
           <exclude name="org/apache/zookeeper/proto"/>
           <exclude name="org/apache/zookeeper/txn"/>
           <exclude name="org/apache/zookeeper/version"/>
@@ -549,7 +601,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
             <fileset dir="${java.src.dir}"/>
             <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
             <manifest>
-                <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" />
+                <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeerMain" />
                 <attribute name="Built-By" value="${user.name}"/>
                 <attribute name="Built-At" value="${build.time}"/>
                 <attribute name="Built-On" value="${host.name}" />
@@ -590,7 +642,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
             <fileset file="LICENSE.txt" />
             <fileset dir="${build.classes}" excludes="**/.generated"/>
             <manifest>
-                <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" />
+                <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeerMain" />
                 <attribute name="Built-By" value="${user.name}"/>
                 <attribute name="Built-At" value="${build.time}"/>
                 <attribute name="Built-On" value="${host.name}" />
@@ -755,7 +807,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
       <copy todir="${dist.dir}">
         <fileset file="CHANGES.txt"/>
-        <fileset file="README.txt"/>
+        <fileset file="README.md"/>
         <fileset file="README_packaging.txt"/>
         <fileset file="build.xml"/>
         <fileset file="ivy.xml"/>
@@ -874,7 +926,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
       <copy todir="${dist.dir}">
         <fileset file="CHANGES.txt"/>
-        <fileset file="README.txt"/>
+        <fileset file="README.md"/>
         <fileset file="README_packaging.txt"/>
         <fileset file="build.xml"/>
         <fileset file="ivy.xml"/>
@@ -1611,6 +1663,29 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
                classpathref="releaseaudit-classpath"/>
     </target>
 
+    <target name="owasp-taskdef" depends="ivy-retrieve-owasp">
+        <typedef format="properties" resource="dependency-check-taskdefs.properties" uri="antlib:org.owasp.dependencycheck.anttasks" classpathref="owasp-classpath"/>
+    </target>
+
+    <target name="owasp" depends="owasp-taskdef,ivy-retrieve" description="OWASP dependency check">
+        <property name="owasp.out.dir" value="${test.java.build.dir}/owasp" />
+
+        <owasp:dependency-check xmlns:owasp="antlib:org.owasp.dependencycheck.anttasks"
+                          projectname="ZooKeeper"
+                          reportoutputdirectory="${owasp.out.dir}"
+                          reportformat="ALL"
+                          failBuildOnCVSS="0">
+
+            <fileset dir="${ivy.lib}">
+                <include name="**/*.jar"/>
+            </fileset>
+
+            <fileset dir="${lib.dir}">
+                <include name="**/*.jar"/>
+            </fileset>
+        </owasp:dependency-check>
+    </target>
+
     <target name="releaseaudit" depends="package,rats-taskdef" description="Release Audit activities">
       <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
         <fileset dir="${dist.dir}">
@@ -1787,7 +1862,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
      </condition>
 
      <target name="ant-eclipse-download" unless="ant-eclipse.jar.exists">
-       <get src="http://downloads.sourceforge.net/project/ant-eclipse/ant-eclipse/1.0/ant-eclipse-1.0.bin.tar.bz2"
+       <get src="https://downloads.sourceforge.net/project/ant-eclipse/ant-eclipse/1.0/ant-eclipse-1.0.bin.tar.bz2"
             dest="${src.dir}/java/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
 
        <bunzip2 src="${src.dir}/java/ant-eclipse-1.0.bin.tar.bz2"/>

debian/changelog

-zookeeper (3.4.10-4) UNRELEASED; urgency=medium
+zookeeper (3.4.12-1) unstable; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Added the Yetus annotations
+  * No longer build the Netty based connection factory (depends on an obsolete
+    version of Netty)
+  * Ensure the unit tests are run in offline mode (Closes: #860650)
+  * Disabled the i386 junit tests (no longer build due to dependencies changes)
   * Removed the unused build dependency on checkstyle
+  * Modified debian/watch to catch all the past releases
+  * Standards-Version updated to 4.1.4
+  * Use salsa.debian.org Vcs-* URLs
+  * Updated the upstream GPG keys
 
- -- Emmanuel Bourg <ebourg@apache.org>  Tue, 13 Mar 2018 00:20:40 +0100
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 05 Jun 2018 23:45:32 +0200
 
 zookeeper (3.4.10-3) unstable; urgency=medium
 

debian/control

@@ -27,7 +27,6 @@ Build-Depends:
  liblog4cxx-dev,
  liblog4j1.2-java (>> 1.2.15-8),
  libmockito-java,
- libnetty-3.9-java,
  libslf4j-java,
  libtool,
  libxerces2-java,
@@ -37,9 +36,9 @@ Build-Depends:
  procps,
  python-all-dev (>= 2.6.6-3~)
 X-Python-Version: >= 2.6
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/zookeeper.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/zookeeper.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/zookeeper.git
+Vcs-Browser: https://salsa.debian.org/java-team/zookeeper
 Homepage: https://zookeeper.apache.org
 
 Package: libzookeeper-java
@@ -47,7 +46,6 @@ Architecture: all
 Depends:
  libjline-java,
  liblog4j1.2-java (>> 1.2.15-8),
- libnetty-3.9-java,
  libslf4j-java,
  libxerces2-java,
  ${misc:Depends}

debian/libzookeeper-java.docs

-README.txt
+README.md

debian/maven.ignoreRules

+com.puppycrawl.tools checkstyle * * * *
+io.netty netty * * * *
+org.apache.yetus audience-annotations * * * *

debian/patches/02-patch-build-system.patch

@@ -4,7 +4,7 @@ Author: James Page <james.page@ubuntu.com>, Thomas Koch <thomas@koch.ro>
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -1245,30 +1245,10 @@
+@@ -1297,30 +1297,10 @@
      <target name="test-init" depends="jar,compile-test">
          <delete dir="${test.log.dir}" />
          <delete dir="${test.tmp.dir}" />
@@ -35,7 +35,7 @@ Forwarded: not-needed
      </target>
  
      <condition property="quicktest">
-@@ -1321,6 +1301,9 @@
+@@ -1373,6 +1353,9 @@
            <batchtest todir="${test.log.dir}" if="fulltest">
              <fileset dir="${test.src.dir}">
                <include name="**/*${test.category}Test.java"/>

debian/patches/04-ZOOKEEPER-705.patch

-Description: Fixes a build failure due to unknown opcode 'lock' in mt_adaptor.c
- This patch can be removed after upgrading to Zookeeper 3.5.0 or later
-Author: Thomas Koch <thomas.koch@ymc.ch>
-Bug: https://issues.apache.org/jira/browse/ZOOKEEPER-705
---- a/src/c/src/mt_adaptor.c
-+++ b/src/c/src/mt_adaptor.c
-@@ -484,11 +484,7 @@ int32_t fetch_and_add(volatile int32_t*
- {
- #ifndef WIN32
-     int32_t result;
--    asm __volatile__(
--         "lock xaddl %0,%1\n"
--         : "=r"(result), "=m"(*(int *)operand)
--         : "0"(incr)
--         : "memory");
-+    result = __sync_fetch_and_add(operand, incr);
-    return result;
- #else
-     volatile int32_t result;

debian/patches/05-ZOOKEEPER-770.patch

@@ -65,7 +65,7 @@ Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-770
          int blen = sizeof(buf);
 --- a/src/c/src/zookeeper.c
 +++ b/src/c/src/zookeeper.c
-@@ -1328,7 +1328,7 @@
+@@ -1355,7 +1355,7 @@
      /* We queued the buffer, so don't free it */
      close_buffer_oarchive(&oa, 0);
  

debian/patches/07-remove-non-reproducible-manifest-entries.patch

@@ -3,27 +3,27 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -550,9 +550,6 @@
+@@ -602,9 +602,6 @@
              <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
              <manifest>
-                 <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" />
+                 <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeerMain" />
 -                <attribute name="Built-By" value="${user.name}"/>
 -                <attribute name="Built-At" value="${build.time}"/>
 -                <attribute name="Built-On" value="${host.name}" />
                  <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                  <attribute name="Implementation-Version" value="${revision}"/> 
                  <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -591,9 +588,6 @@
+@@ -643,9 +640,6 @@
              <fileset dir="${build.classes}" excludes="**/.generated"/>
              <manifest>
-                 <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" />
+                 <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeerMain" />
 -                <attribute name="Built-By" value="${user.name}"/>
 -                <attribute name="Built-At" value="${build.time}"/>
 -                <attribute name="Built-On" value="${host.name}" />
                  <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                  <attribute name="Implementation-Version" value="${revision}"/> 
                  <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -623,9 +617,6 @@
+@@ -675,9 +669,6 @@
              <fileset dir="${java.src.dir}"/>
              <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
              <manifest>
@@ -33,7 +33,7 @@ Forwarded: no
                  <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                  <attribute name="Implementation-Version" value="${revision}"/> 
                  <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -641,9 +632,6 @@
+@@ -693,9 +684,6 @@
              <fileset file="LICENSE.txt" />
              <fileset dir="${build.javadoc}"/>
              <manifest>
@@ -43,7 +43,7 @@ Forwarded: no
                  <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                  <attribute name="Implementation-Version" value="${revision}"/> 
                  <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -659,9 +647,6 @@
+@@ -711,9 +699,6 @@
              <fileset file="LICENSE.txt" />
              <fileset dir="${test.java.classes}"/>
              <manifest>

debian/patches/08-reproducible-javadoc.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -474,6 +474,8 @@
+@@ -525,6 +525,8 @@
           windowtitle="${Name} ${version} API"
           doctitle="${Name} ${version} API"
           bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
@@ -12,12 +12,12 @@ Forwarded: no
           >
      	<packageset dir="${java.src.dir}">
            <include name="org/apache/**"/>
-@@ -498,6 +500,8 @@
+@@ -549,6 +551,8 @@
           windowtitle="${Name} ${version} API"
           doctitle="${Name} ${version} API"
           bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
 +         locale="en"
 +         additionalparam="-notimestamp"
+          doclet="org.apache.yetus.audience.tools.IncludePublicAnnotationsStandardDoclet"
+          docletpath="${ivy.lib}/audience-annotations-${audience-annotations.version}.jar"
           >
-     	<fileset dir="${java.src.dir}">
-           <include name="org/apache/**/*Main.java"/>

debian/patches/12-add-yetus-annotations.patch

+Description: Adds the Yetus annotations (https://yetus.apache.org)
+Author: Emmanuel Bourg <ebourg@pache.org>
+Forwarded: not-needed
+--- /dev/null
++++ b/src/java/main/org/apache/yetus/audience/InterfaceAudience.java
+@@ -0,0 +1,74 @@
++/*
++ * 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.
++ */
++package org.apache.yetus.audience;
++
++import java.lang.annotation.Documented;
++import java.lang.annotation.Retention;
++import java.lang.annotation.RetentionPolicy;
++
++/**
++ * Annotation to inform users of a package, class or method's intended audience.
++ * Currently the audience can be {@link Public}, {@link LimitedPrivate} or
++ * {@link Private}. <br>
++ * All public classes must have InterfaceAudience annotation. <br>
++ * <ul>
++ * <li>Public classes that are not marked with this annotation must be
++ * considered by default as {@link Private}.</li>
++ *
++ * <li>External applications must only use classes that are marked
++ * {@link Public}. Avoid using non public classes as these classes
++ * could be removed or change in incompatible ways.</li>
++ *
++ * <li>Some projects may choose to give special consideration to related
++ * projects. Such consideration can be done by using the {@link LimitedPrivate}
++ * annotation with a named set of projects.</li>
++ *
++ * <li> Methods may have a different annotation that it is more restrictive
++ * compared to the audience classification of the class. Example: A class
++ * might be {@link Public}, but a method may be {@link LimitedPrivate}
++ * </li></ul>
++ */
++@InterfaceAudience.Public
++@InterfaceStability.Evolving
++public class InterfaceAudience {
++  /**
++   * Intended for use by any project or application.
++   */
++  @Documented
++  @Retention(RetentionPolicy.RUNTIME)
++  public @interface Public {};
++
++  /**
++   * Intended only for the project(s) specified in the annotation.
++   * For example, "Hadoop Common", "HDFS", "MapReduce", "ZooKeeper", "HBase".
++   */
++  @Documented
++  @Retention(RetentionPolicy.RUNTIME)
++  public @interface LimitedPrivate {
++    String[] value();
++  };
++
++  /**
++   * Intended for use only within a given project.
++   */
++  @Documented
++  @Retention(RetentionPolicy.RUNTIME)
++  public @interface Private {};
++
++  private InterfaceAudience() {} // Audience can't exist on its own
++}
+--- /dev/null
++++ b/src/java/main/org/apache/yetus/audience/InterfaceStability.java
+@@ -0,0 +1,65 @@
++/*
++ * 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.
++ */
++package org.apache.yetus.audience;
++
++import java.lang.annotation.Documented;
++import java.lang.annotation.Retention;
++import java.lang.annotation.RetentionPolicy;
++
++import org.apache.yetus.audience.InterfaceAudience.LimitedPrivate;
++import org.apache.yetus.audience.InterfaceAudience.Private;
++import org.apache.yetus.audience.InterfaceAudience.Public;
++
++/**
++ * Annotation to inform users of how much to rely on a particular package,
++ * class or method not changing over time. Currently the stability can be
++ * {@link Stable}, {@link Evolving} or {@link Unstable}. <br>
++ *
++ * <ul><li>All classes that are annotated with {@link Public} or
++ * {@link LimitedPrivate} must have InterfaceStability annotation. </li>
++ * <li>Classes that are {@link Private} are to be considered unstable unless
++ * a different InterfaceStability annotation states otherwise.</li>
++ * <li>Incompatible changes must not be made to classes marked as stable.</li>
++ * </ul>
++ */
++@InterfaceAudience.Public
++@InterfaceStability.Evolving
++public class InterfaceStability {
++  /**
++   * Can evolve while retaining compatibility for minor release boundaries.;
++   * can break compatibility only at major release (ie. at m.0).
++   */
++  @Documented
++  @Retention(RetentionPolicy.RUNTIME)
++  public @interface Stable {};
++
++  /**
++   * Evolving, but can break compatibility at minor release (i.e. m.x)
++   */
++  @Documented
++  @Retention(RetentionPolicy.RUNTIME)
++  public @interface Evolving {};
++
++  /**
++   * No guarantee is provided as to reliability or stability across any
++   * level of release granularity.
++   */
++  @Documented
++  @Retention(RetentionPolicy.RUNTIME)
++  public @interface Unstable {};
++}

debian/patches/13-disable-netty-connection-factory.patch

+Description: Disables the optional Netty based connection factory until it's updated to work with Netty 4+
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -448,6 +448,7 @@
+ 
+     <target name="compile" depends="ivy-retrieve,clover,build-generated">
+         <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
++               excludes="**/Netty*"
+                target="${javac.target}" source="${javac.source}" debug="on">
+             <classpath refid="java.classpath"/>
+             <compilerarg value="-Xlint:all"/>

debian/patches/series

 01-add-jtoaster-to-zooinspector.patch
 02-patch-build-system.patch
 03-disable-cygwin-detection.patch
-04-ZOOKEEPER-705.patch
 05-ZOOKEEPER-770.patch
 06-ftbfs-gcc-4.7.patch
 07-remove-non-reproducible-manifest-entries.patch
 08-reproducible-javadoc.patch
 10-cppunit-pkg-config.patch
 11-disable-minikdc-tests.patch
+12-add-yetus-annotations.patch
+13-disable-netty-connection-factory.patch

debian/rules

@@ -11,6 +11,7 @@ ANT_ARGS = -Dversion=$(DEB_UPSTREAM_VERSION) \
            -DlastRevision=-1 \
            -Divy.url=file:/usr/share/maven-repo/org/apache/ivy/ivy/ \
            -Divy.version=debian \
+           -Dapache-directory-api.version=debian \
            -Divysettings.xml=/usr/share/ivy-debian-helper/ivysettings.xml \
            -Dant.build.javac.source=1.8 \
            -Dant.build.javac.target=1.8
@@ -90,10 +91,7 @@ endif
 ifeq (i386, $(DEB_BUILD_ARCH))
 override_dh_auto_test-indep:
 	# Run core Java test suite against zookeeper
-	ant $(ANT_ARGS) \
-		-Divy.settings.file=/usr/share/ivy-debian-helper/ivysettings.xml \
-		-Divy.default.ivy.user.dir=$(CURDIR)/.ivy2 \
-		test-core-java
+	#dh_auto_build -- $(ANT_ARGS) test-core-java
 endif
 endif
 

debian/watch

 version=3
 opts=dversionmangle=s/\+dfsg\d+$//,pgpsigurlmangle=s/$/.asc/ \
-  http://www.eu.apache.org/dist/zookeeper/stable/zookeeper-([0-9.]+).tar.gz \
+  https://archive.apache.org/dist/zookeeper/zookeeper-([0-9.]+)/zookeeper-([0-9.]+).tar.gz \
   debian debian/orig-tar.sh

ivy.xml

@@ -28,11 +28,12 @@
   <configurations defaultconfmapping="default">
     <conf name="master"/>
     <conf name="default"/>
-    <conf name="test"/>
+    <conf name="test" extends="default"/>
     <conf name="mvn-ant-task" visibility="private"/>
     <conf name="package" extends="master"/>
     <conf name="jdiff" visibility="private"/>
     <conf name="releaseaudit" visibility="private" description="Artifacts required for releaseaudit target"/>
+    <conf name="owasp" visibility="private" description="Artifacts required for owasp target"/>
   </configurations>
 
   <publications>
@@ -40,76 +41,110 @@
   </publications>
 
   <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"/>
-  
-    <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.slf4j" name="slf4j-api" rev="${slf4j.version}"/>
+    <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}" transitive="false"/>
+
+    <dependency org="org.apache.maven.wagon" name="wagon-http" rev="${wagon-http.version}"
+                conf="mvn-ant-task->default"/>
+    <dependency org="org.apache.maven" name="maven-ant-tasks" rev="${maven-ant-tasks.version}"
+                conf="mvn-ant-task->default">
+        <exclude org="org.codehaus.plexus" module="plexus-utils"/>
+        <exclude org="org.apache.maven.wagon" module="wagon-provider-api" />
+    </dependency>
     <!-- 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="${log4j.version}" transitive="false" conf="default"/>
+    <dependency org="jline" name="jline" rev="${jline.version}" transitive="false" conf="default"/>
+
+    <dependency org="org.apache.yetus" name="audience-annotations" rev="${audience-annotations.version}"/>
 
-    <dependency org="io.netty" name="netty" conf="default" rev="3.10.5.Final">
+    <dependency org="io.netty" name="netty" conf="default" rev="${netty.version}">
       <artifact name="netty" type="jar" conf="default"/>
     </dependency>
 
-    <dependency org="org.vafer" name="jdeb" rev="0.8" conf="package->master"/>
+    <dependency org="org.vafer" name="jdeb" rev="${jdeb.version}" conf="package->master"/>
 
-    <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
-     <dependency org="org.mockito" name="mockito-all" rev="1.8.2"
+    <dependency org="junit" name="junit" rev="${junit.version}" conf="test->default"/>
+    <dependency org="org.mockito" name="mockito-all" rev="${mockito.version}"
                conf="test->default"/>
-    <dependency org="com.puppycrawl.tools" name="checkstyle" rev="6.1.1"
+    <dependency org="com.puppycrawl.tools" name="checkstyle" rev="${checkstyle.version}"
                 conf="test->default"/>
     <dependency org="commons-collections" name="commons-collections" 
-                rev="3.2.2" conf="test->default"/>
+                rev="${commons-collections.version}" conf="test->default"/>
 
-    <dependency org="jdiff" name="jdiff" rev="1.0.9"
+    <dependency org="jdiff" name="jdiff" rev="${jdiff.version}"
                 conf="jdiff->default"/>
-    <dependency org="xerces" name="xerces" rev="1.4.4"
+    <dependency org="xerces" name="xerces" rev="${xerces.version}"
                 conf="jdiff->default"/>
 
     <dependency org="org.apache.rat" name="apache-rat-tasks" 
-                rev="0.6" conf="releaseaudit->default"/>
+                rev="${apache-rat-tasks.version}" conf="releaseaudit->default">
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="commons-lang" module="commons-lang"/>
+    </dependency>
     <dependency org="commons-lang" name="commons-lang" 
-                rev="2.4" conf="releaseaudit->default"/>
+                rev="${commons-lang.version}" conf="releaseaudit->default"/>
     <dependency org="commons-collections" name="commons-collections"
-                rev="3.2.2" conf="releaseaudit->default"/>
+                rev="${commons-collections.version}" conf="releaseaudit->default"/>
+    <dependency org="org.owasp" name="dependency-check-ant"
+                rev="${dependency-check-ant.version}" conf="owasp->default"/>
 
-    <dependency org="commons-io" name="commons-io" rev="2.4"
+    <dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
                 conf="test->default"/>
 
 
     <!-- Apache directory server project, org.apache.directory.* packages for miniKdc tests -->
-    <dependency org="org.apache.directory.server" name="apacheds-core-api" rev="2.0.0-M15" conf="test->default">
-        <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+    <dependency org="org.apache.directory.server" name="apacheds-core-api" rev="${apache-directory-server.version}" conf="test->default">
+        <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+        <exclude org="org.slf4j" module="slf4j-api"/>
+        <exclude org="commons-collections" module="commons-collections"/>
     </dependency>
-    <dependency org="org.apache.directory.server" name="apacheds-interceptor-kerberos" rev="2.0.0-M15" conf="test->default">
-        <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+    <dependency org="org.apache.directory.server" name="apacheds-interceptor-kerberos" rev="${apache-directory-server.version}" conf="test->default">
+        <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="org.slf4j" module="slf4j-api"/>
     </dependency>
-    <dependency org="org.apache.directory.server" name="apacheds-protocol-shared" rev="2.0.0-M15" conf="test->default">
-        <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+    <dependency org="org.apache.directory.server" name="apacheds-protocol-shared" rev="${apache-directory-server.version}" conf="test->default">
+        <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="org.slf4j" module="slf4j-api"/>
     </dependency>
-    <dependency org="org.apache.directory.server" name="apacheds-protocol-kerberos" rev="2.0.0-M15" conf="test->default">
-        <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+    <dependency org="org.apache.directory.server" name="apacheds-protocol-kerberos" rev="${apache-directory-server.version}" conf="test->default">
+        <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="org.slf4j" module="slf4j-api"/>
     </dependency>
-    <dependency org="org.apache.directory.server" name="apacheds-ldif-partition" rev="2.0.0-M15" conf="test->default">
-        <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+    <dependency org="org.apache.directory.server" name="apacheds-ldif-partition" rev="${apache-directory-server.version}" conf="test->default">
+        <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="org.slf4j" module="slf4j-api"/>
     </dependency>
-    <dependency org="org.apache.directory.server" name="apacheds-mavibot-partition" rev="2.0.0-M15" conf="test->default">
-        <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+    <dependency org="org.apache.directory.server" name="apacheds-mavibot-partition" rev="${apache-directory-server.version}" conf="test->default">
+        <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="org.slf4j" module="slf4j-log4j12"/>
+        <exclude org="log4j" module="log4j"/>
+        <exclude org="org.slf4j" module="slf4j-api"/>
     </dependency>
-    <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M20" conf="test->default">
-        <exclude org="xml-apis" name="xml-apis"/>
-        <exclude org="xpp3" name="xpp3"/>
-        <exclude org="dom4j" name="dom4j"/>
+    <dependency org="org.apache.directory.api" name="api-all" rev="${apache-directory-api.version}" conf="test->default">
+        <exclude org="xml-apis" module="xml-apis"/>
+        <exclude org="xpp3" module="xpp3"/>
+        <exclude org="dom4j" module="dom4j"/>
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="org.slf4j" module="slf4j-api"/>
     </dependency>
-    <dependency org="org.apache.directory.server" name="apacheds-jdbm-partition" rev="2.0.0-M15" conf="test->default">
-        <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+    <dependency org="org.apache.directory.server" name="apacheds-jdbm-partition" rev="${apache-directory-server.version}" conf="test->default">
+        <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="org.slf4j" module="slf4j-api"/>
     </dependency>
-    <dependency org="org.apache.directory.server" name="apacheds-protocol-ldap" rev="2.0.0-M15" conf="test->default">
-        <exclude org="org.apache.directory.api" name="api-ldap-schema-data"/>
+    <dependency org="org.apache.directory.server" name="apacheds-protocol-ldap" rev="${apache-directory-server.version}" conf="test->default">
+        <exclude org="org.apache.directory.api" module="api-ldap-schema-data"/>
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="org.slf4j" module="slf4j-api"/>
     </dependency>
 
+    <conflict manager="strict"/>
+
   </dependencies>
 
 </ivy-module>