From 51bef0752de1a86b3d3173437ddcc4266b3f5905 Mon Sep 17 00:00:00 2001
From: Jan Hentschel <jan.hentschel@ultratendency.com>
Date: Thu, 12 Jul 2018 13:47:05 +0200
Subject: [PATCH] NIFI-3993 Updated the ZooKeeper version to 3.4.10

---
 .../nifi/controller/state/server/ZooKeeperStateServer.java      | 2 +-
 nifi-nar-bundles/nifi-framework-bundle/pom.xml                  | 2 +-
 nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
index 9db146d9fe0a..f95923312b62 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/server/ZooKeeperStateServer.java
@@ -112,7 +112,7 @@ private void startDistributed() throws IOException {
             connectionFactory = ServerCnxnFactory.createFactory();
             connectionFactory.configure(quorumPeerConfig.getClientPortAddress(), quorumPeerConfig.getMaxClientCnxns());
 
-            quorumPeer = new QuorumPeer();
+            quorumPeer = QuorumPeer.testingQuorumPeer();
             quorumPeer.setClientPortAddress(quorumPeerConfig.getClientPortAddress());
             quorumPeer.setTxnFactory(new FileTxnSnapLog(new File(quorumPeerConfig.getDataLogDir()), new File(quorumPeerConfig.getDataDir())));
             quorumPeer.setQuorumPeers(quorumPeerConfig.getServers());
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 3d82203ee5d5..664f97e562aa 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -579,7 +579,7 @@
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
-                <version>3.4.6</version>
+                <version>3.4.10</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.curator</groupId>
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
index 5d8b97f74b86..20f2e18ee6d3 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
-            <version>3.4.6</version>
+            <version>3.4.10</version>
             <exclusions>
                 <exclusion>
                     <groupId>log4j</groupId>