From 45030e76eb6ea54196b722577e2e51ba5f3d9ef3 Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Fri, 3 Aug 2012 15:22:17 +0000
Subject: [PATCH] SOLR-3639: Update ZooKeeper to 3.3.6

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1369025 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/eclipse/dot.classpath        | 2 +-
 dev-tools/maven/pom.xml.template       | 2 +-
 solr/CHANGES.txt                       | 2 +-
 solr/licenses/zookeeper-3.3.5.jar.sha1 | 1 -
 solr/licenses/zookeeper-3.3.6.jar.sha1 | 1 +
 solr/solrj/ivy.xml                     | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 solr/licenses/zookeeper-3.3.5.jar.sha1
 create mode 100644 solr/licenses/zookeeper-3.3.6.jar.sha1

diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index 751c238545b..66e7bbc0312 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -120,7 +120,7 @@
 	<classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
 	<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
 	<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
-	<classpathentry kind="lib" path="solr/lib/zookeeper-3.3.5.jar"/>
+	<classpathentry kind="lib" path="solr/lib/zookeeper-3.3.6.jar"/>
   <classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.2.v20120308.jar"/>
   <classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.2.v20120308.jar"/>
   <classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.2.v20120308.jar"/>
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 4d4f2333af4..599e710bb10 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -298,7 +298,7 @@
       <dependency>
         <groupId>org.apache.zookeeper</groupId>
         <artifactId>zookeeper</artifactId>
-        <version>3.3.5</version>
+        <version>3.3.6</version>
       </dependency>
       <dependency>
         <groupId>org.carrot2</groupId>
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index dcb66af077d..8502336bc65 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -32,7 +32,7 @@ Apache Tika 1.1
 Carrot2 3.5.0
 Velocity 1.6.4 and Velocity Tools 2.0
 Apache UIMA 2.3.1
-Apache ZooKeeper 3.3.5
+Apache ZooKeeper 3.3.6
 
 Upgrading from Solr 4.0.0-ALPHA
 ----------------------
diff --git a/solr/licenses/zookeeper-3.3.5.jar.sha1 b/solr/licenses/zookeeper-3.3.5.jar.sha1
deleted file mode 100644
index dfa6acc5363..00000000000
--- a/solr/licenses/zookeeper-3.3.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5ee2093c5516a665d947b698cb6848f5af1d4482
diff --git a/solr/licenses/zookeeper-3.3.6.jar.sha1 b/solr/licenses/zookeeper-3.3.6.jar.sha1
new file mode 100644
index 00000000000..8bd4cd08bb2
--- /dev/null
+++ b/solr/licenses/zookeeper-3.3.6.jar.sha1
@@ -0,0 +1 @@
+36825ff1595144d42d2f3a51f810eaefdcf8cb79
diff --git a/solr/solrj/ivy.xml b/solr/solrj/ivy.xml
index d9a6df65330..7c8f605df8f 100644
--- a/solr/solrj/ivy.xml
+++ b/solr/solrj/ivy.xml
@@ -20,7 +20,7 @@
     <info organisation="org.apache.solr" module="solrj"/>
 
     <dependencies>
-      <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.5" transitive="false"/>
+      <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.3.6" transitive="false"/>
       <dependency org="org.slf4j" name="log4j-over-slf4j" rev="1.6.4" transitive="false"/>
       <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.1.4" transitive="false"/>
       <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.1.3" transitive="false"/>