From 58376874aae7639b6da605e0e92b9464a59a9b85 Mon Sep 17 00:00:00 2001
From: erick <erick.erickson@gmail.com>
Date: Tue, 2 Apr 2019 20:18:01 -0700
Subject: [PATCH] SOLR-13363: Upgrade to ZooKeeper 3.4.14

---
 lucene/ivy-versions.properties          | 2 +-
 solr/CHANGES.txt                        | 4 +++-
 solr/licenses/zookeeper-3.4.13.jar.sha1 | 1 -
 solr/licenses/zookeeper-3.4.14.jar.sha1 | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/zookeeper-3.4.13.jar.sha1
 create mode 100644 solr/licenses/zookeeper-3.4.14.jar.sha1

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 3257d3d5afa..2a8bc57a4d9 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -197,7 +197,7 @@ org.apache.velocity.tools.version = 3.0
 /org.apache.velocity/velocity-engine-core = 2.0
 
 /org.apache.xmlbeans/xmlbeans = 3.0.1
-/org.apache.zookeeper/zookeeper = 3.4.13
+/org.apache.zookeeper/zookeeper = 3.4.14
 
 # v1.6.0-alpha.5 of asciidoctor-ant includes asciidoctorj-pdf 1.5.0-alpha.16,
 # which is the same as asciidoctor-pdf 1.5.0-alpha.16
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e6696243c28..0ef08124178 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -63,7 +63,7 @@ Versions of Major Components
 Apache Tika 1.19.1
 Carrot2 3.16.0
 Velocity 2.0 and Velocity Tools 3.0
-Apache ZooKeeper 3.4.13
+Apache ZooKeeper 3.4.14
 Jetty 9.4.14.v20181114
 
 Upgrade Notes
@@ -210,6 +210,8 @@ Other Changes
 
 * SOLR-13353: Add SolrCli AuthTool test (Kevin Risden)
 
+* SOLR-13363: Upgrade to ZooKeeper 3.4.14 (Erick Erickson)
+
 ==================  8.0.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/licenses/zookeeper-3.4.13.jar.sha1 b/solr/licenses/zookeeper-3.4.13.jar.sha1
deleted file mode 100644
index a9df3b1e7f4..00000000000
--- a/solr/licenses/zookeeper-3.4.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-31e9937541cef95c4585b547eb2dbd34d3a76f1c
diff --git a/solr/licenses/zookeeper-3.4.14.jar.sha1 b/solr/licenses/zookeeper-3.4.14.jar.sha1
new file mode 100644
index 00000000000..6adbf71d724
--- /dev/null
+++ b/solr/licenses/zookeeper-3.4.14.jar.sha1
@@ -0,0 +1 @@
+c114c1e1c8172a7cd3f6ae39209a635f7a06c1a1