From afb0d04c3d98a613da0f6d4dc4373c06b50cd412 Mon Sep 17 00:00:00 2001
From: Nick Allen <nickallen@apache.org>
Date: Tue, 17 Sep 2019 16:48:47 -0400
Subject: [PATCH 1/8] METRON-2261 Isolate Curator Dependencies

---
 metron-analytics/metron-maas-common/pom.xml   |  45 +++--
 metron-analytics/metron-maas-service/pom.xml  |  54 ++++--
 .../metron-profiler-spark/pom.xml             |  22 +++
 .../metron-profiler-storm/pom.xml             |  45 +++++
 metron-interface/metron-rest/pom.xml          |  38 ++++-
 .../metron-common-storm/pom.xml               |  21 ++-
 metron-platform/metron-common/pom.xml         | 105 +++++++++++-
 .../metron-data-management/pom.xml            |  55 ++++++
 .../metron-elasticsearch-common/pom.xml       |  25 +++
 .../metron-enrichment-storm/pom.xml           |  25 +++
 metron-platform/metron-enrichment/pom.xml     |  15 ++
 metron-platform/metron-hbase-server/pom.xml   |  45 +++++
 .../metron-hbase/metron-hbase-common/pom.xml  |  62 +++++--
 .../metron-indexing-common/pom.xml            |  31 +++-
 .../metron-indexing-storm/pom.xml             |  15 ++
 .../metron-integration-test/pom.xml           | 161 ++++++++++++++++--
 metron-platform/metron-management/pom.xml     |  55 +++++-
 .../metron-parsers-common/pom.xml             |  47 +++--
 metron-platform/metron-pcap-backend/pom.xml   |  43 ++++-
 metron-platform/metron-pcap/pom.xml           |  15 ++
 .../metron-solr/metron-solr-common/pom.xml    |  25 +++
 metron-platform/metron-test-utilities/pom.xml |  64 +++++--
 .../metron-writer-common/pom.xml              |  45 +++++
 .../metron-writer/metron-writer-storm/pom.xml |  10 ++
 metron-platform/metron-zookeeper/pom.xml      |  53 ++++--
 metron-stellar/stellar-common/pom.xml         | 104 ++++++++++-
 metron-stellar/stellar-zeppelin/pom.xml       |  15 ++
 pom.xml                                       |  11 +-
 28 files changed, 1134 insertions(+), 117 deletions(-)

diff --git a/metron-analytics/metron-maas-common/pom.xml b/metron-analytics/metron-maas-common/pom.xml
index b4041118ba..4fa3163760 100644
--- a/metron-analytics/metron-maas-common/pom.xml
+++ b/metron-analytics/metron-maas-common/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  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. 
+<!--
+  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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -54,11 +54,25 @@
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-recipes</artifactId>
       <version>${global_curator_version}</version>
+      <exclusions>
+        <exclusion>
+          <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+          <groupId>org.apache.zookeeper</groupId>
+          <artifactId>zookeeper</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-x-discovery</artifactId>
       <version>${global_curator_version}</version>
+      <exclusions>
+        <exclusion>
+          <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+          <groupId>org.apache.zookeeper</groupId>
+          <artifactId>zookeeper</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -83,8 +97,15 @@
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-test</artifactId>
-      <version>${curator.version}</version>
+      <version>${global_curator_test_version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+          <groupId>org.apache.zookeeper</groupId>
+          <artifactId>zookeeper</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>
diff --git a/metron-analytics/metron-maas-service/pom.xml b/metron-analytics/metron-maas-service/pom.xml
index ebb58bde61..3a17277a71 100644
--- a/metron-analytics/metron-maas-service/pom.xml
+++ b/metron-analytics/metron-maas-service/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  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. 
+<!--
+  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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -59,6 +59,23 @@
       <artifactId>hadoop-yarn-server-common</artifactId>
       <version>${hadoop.version}</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -119,16 +136,19 @@
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-          <groupId>org.apache.curator</groupId>
-          <artifactId>curator-recipes</artifactId>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.apache.curator</groupId>
-          <artifactId>curator-client</artifactId>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.apache.curator</groupId>
-          <artifactId>curator-framework</artifactId>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/metron-analytics/metron-profiler-spark/pom.xml b/metron-analytics/metron-profiler-spark/pom.xml
index 0c5a4e5ccf..b7fd764595 100644
--- a/metron-analytics/metron-profiler-spark/pom.xml
+++ b/metron-analytics/metron-profiler-spark/pom.xml
@@ -32,6 +32,13 @@
           <groupId>org.apache.spark</groupId>
           <artifactId>spark-core_2.11</artifactId>
           <version>${global_spark_version}</version>
+          <exclusions>
+              <exclusion>
+                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <groupId>org.apache.curator</groupId>
+                  <artifactId>curator-recipes</artifactId>
+              </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
@@ -155,6 +162,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/metron-analytics/metron-profiler-storm/pom.xml b/metron-analytics/metron-profiler-storm/pom.xml
index 5a2bd34440..4433f9d139 100644
--- a/metron-analytics/metron-profiler-storm/pom.xml
+++ b/metron-analytics/metron-profiler-storm/pom.xml
@@ -67,6 +67,26 @@
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>httpclient</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -94,6 +114,16 @@
                     <artifactId>commons-lang</artifactId>
                     <groupId>commons-lang</groupId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -210,6 +240,21 @@
                     <artifactId>commons-lang</artifactId>
                     <groupId>commons-lang</groupId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml
index 75f3dc9c5b..f261d45b3d 100644
--- a/metron-interface/metron-rest/pom.xml
+++ b/metron-interface/metron-rest/pom.xml
@@ -27,7 +27,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <antlr.version>4.5</antlr.version>
-        <curator.version>2.7.1</curator.version>
         <powermock.version>1.6.4</powermock.version>
         <spring.boot.version>2.0.1.RELEASE</spring.boot.version>
         <spring.kerberos.version>1.0.1.RELEASE</spring.kerberos.version>
@@ -127,7 +126,7 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
-            <version>${curator.version}</version>
+            <version>${global_curator_version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.guava</groupId>
@@ -137,6 +136,11 @@
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>
+              <exclusion>
+                <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+              </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -246,6 +250,21 @@
               <groupId>javax.servlet</groupId>
               <artifactId>servlet-api</artifactId>
             </exclusion>
+            <exclusion>
+                <!-- to avoid pulling in curator 2.12.0 -->
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-framework</artifactId>
+            </exclusion>
+            <exclusion>
+                <!-- to avoid pulling in curator 2.12.0 -->
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-client</artifactId>
+            </exclusion>
+            <exclusion>
+                <!-- to avoid pulling in curator 2.12.0 -->
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-recipes</artifactId>
+            </exclusion>
           </exclusions>
       </dependency>
       <dependency>
@@ -445,6 +464,21 @@
                     <groupId>commons-httpclient</groupId>
                     <artifactId>commons-httpclient</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-common-streaming/metron-common-storm/pom.xml b/metron-platform/metron-common-streaming/metron-common-storm/pom.xml
index 27f3aa1180..2b9fbed59d 100644
--- a/metron-platform/metron-common-streaming/metron-common-storm/pom.xml
+++ b/metron-platform/metron-common-streaming/metron-common-storm/pom.xml
@@ -74,15 +74,34 @@
         <artifactId>flux-core</artifactId>
         <version>${global_flux_version}</version>
       </dependency>
+      <dependency>
+          <groupId>org.apache.zookeeper</groupId>
+          <artifactId>zookeeper</artifactId>
+          <version>${global_zookeeper_version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.curator</groupId>
         <artifactId>curator-client</artifactId>
         <version>${global_curator_version}</version>
+        <exclusions>
+            <exclusion>
+                <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+            </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.curator</groupId>
         <artifactId>curator-test</artifactId>
-        <version>${global_curator_version}</version>
+        <version>${global_curator_test_version}</version>
+        <exclusions>
+            <exclusion>
+                <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+            </exclusion>
+        </exclusions>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml
index 710abc71e9..0fdd2d907e 100644
--- a/metron-platform/metron-common/pom.xml
+++ b/metron-platform/metron-common/pom.xml
@@ -39,6 +39,47 @@
         </repository>
     </repositories>
     <dependencies>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>${global_zookeeper_version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>curator-client</artifactId>
+          <version>${global_curator_version}</version>
+          <exclusions>
+              <exclusion>
+                  <!-- need to exclude zookeeper 3.5.x -->
+                  <groupId>org.apache.zookeeper</groupId>
+                  <artifactId>zookeeper</artifactId>
+              </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>curator-recipes</artifactId>
+          <version>${global_curator_version}</version>
+          <exclusions>
+              <exclusion>
+                  <!-- need to exclude zookeeper 3.5.x -->
+                  <groupId>org.apache.zookeeper</groupId>
+                  <artifactId>zookeeper</artifactId>
+              </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>curator-framework</artifactId>
+          <version>${global_curator_version}</version>
+          <exclusions>
+              <exclusion>
+                  <!-- need to exclude zookeeper 3.5.x -->
+                  <groupId>org.apache.zookeeper</groupId>
+                  <artifactId>zookeeper</artifactId>
+              </exclusion>
+          </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.metron</groupId>
             <artifactId>metron-maas-common</artifactId>
@@ -70,6 +111,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -146,11 +202,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-client</artifactId>
-            <version>${global_curator_version}</version>
-        </dependency>
         <dependency>
             <groupId>org.atteo.classindex</groupId>
             <artifactId>classindex</artifactId>
@@ -206,6 +257,26 @@
                     <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -229,6 +300,21 @@
                     <groupId>asm</groupId>
                     <artifactId>asm</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -254,8 +340,15 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-test</artifactId>
-            <version>${global_curator_version}</version>
+            <version>${global_curator_test_version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
diff --git a/metron-platform/metron-data-management/pom.xml b/metron-platform/metron-data-management/pom.xml
index 6ea2fb0252..13fc42e808 100644
--- a/metron-platform/metron-data-management/pom.xml
+++ b/metron-platform/metron-data-management/pom.xml
@@ -168,6 +168,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -187,6 +202,16 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
             <scope>provided</scope>
         </dependency>
@@ -245,6 +270,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -295,6 +335,21 @@
                     <artifactId>log4j-over-slf4j</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml b/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml
index 052586a4bc..2bbf9809ad 100644
--- a/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml
+++ b/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml
@@ -155,6 +155,16 @@
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>httpcore</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
              </exclusions>
         </dependency>
         <dependency>
@@ -209,6 +219,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml b/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
index 4bbf65339a..846bfe052c 100644
--- a/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
+++ b/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
@@ -132,6 +132,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -224,6 +239,16 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/metron-platform/metron-enrichment/pom.xml b/metron-platform/metron-enrichment/pom.xml
index 1095021e90..a85a556b1c 100644
--- a/metron-platform/metron-enrichment/pom.xml
+++ b/metron-platform/metron-enrichment/pom.xml
@@ -66,6 +66,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-hbase-server/pom.xml b/metron-platform/metron-hbase-server/pom.xml
index 0d33af4000..f76e55827c 100644
--- a/metron-platform/metron-hbase-server/pom.xml
+++ b/metron-platform/metron-hbase-server/pom.xml
@@ -132,6 +132,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -191,6 +206,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -203,6 +233,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-hbase/metron-hbase-common/pom.xml b/metron-platform/metron-hbase/metron-hbase-common/pom.xml
index 5b484c2a21..6797d71168 100644
--- a/metron-platform/metron-hbase/metron-hbase-common/pom.xml
+++ b/metron-platform/metron-hbase/metron-hbase-common/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  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. 
+<!--
+  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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -69,6 +69,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -99,6 +114,16 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -151,6 +176,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-indexing/metron-indexing-common/pom.xml b/metron-platform/metron-indexing/metron-indexing-common/pom.xml
index 2850983335..c81cc0d5a8 100644
--- a/metron-platform/metron-indexing/metron-indexing-common/pom.xml
+++ b/metron-platform/metron-indexing/metron-indexing-common/pom.xml
@@ -59,7 +59,11 @@
             <version>${global_log4j_core_version}</version>
             <scope>runtime</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math</artifactId>
+            <version>2.2</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-client</artifactId>
@@ -114,6 +118,16 @@
                     <artifactId>log4j</artifactId>
                     <groupId>log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -143,6 +157,21 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
             <exclusions>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
diff --git a/metron-platform/metron-indexing/metron-indexing-storm/pom.xml b/metron-platform/metron-indexing/metron-indexing-storm/pom.xml
index ce3fb30cb8..7cf6c5c901 100644
--- a/metron-platform/metron-indexing/metron-indexing-storm/pom.xml
+++ b/metron-platform/metron-indexing/metron-indexing-storm/pom.xml
@@ -75,6 +75,21 @@
                     <groupId>io.netty</groupId>
                     <artifactId>netty-all</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-integration-test/pom.xml b/metron-platform/metron-integration-test/pom.xml
index 76520d4333..aaf13e69e1 100644
--- a/metron-platform/metron-integration-test/pom.xml
+++ b/metron-platform/metron-integration-test/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  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. 
+<!--
+  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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -27,6 +27,11 @@
   <properties>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>${global_zookeeper_version}</version>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -37,13 +42,47 @@
       <artifactId>junit</artifactId>
       <version>${global_junit_version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.storm</groupId>
       <artifactId>flux-core</artifactId>
       <version>${global_flux_version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-client</artifactId>
+      <version>${global_curator_version}</version>
+      <exclusions>
+          <exclusion>
+              <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+              <groupId>org.apache.zookeeper</groupId>
+              <artifactId>zookeeper</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+      <version>${global_curator_version}</version>
+      <exclusions>
+          <exclusion>
+              <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+              <groupId>org.apache.zookeeper</groupId>
+              <artifactId>zookeeper</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+      <version>${global_curator_version}</version>
+      <exclusions>
+          <exclusion>
+              <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+              <groupId>org.apache.zookeeper</groupId>
+              <artifactId>zookeeper</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.storm</groupId>
       <artifactId>storm-core</artifactId>
@@ -77,6 +116,25 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.zookeeper</groupId>
+          <artifactId>zookeeper</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -96,6 +154,21 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -144,20 +217,29 @@
         </exclusion>
       </exclusions>
     </dependency>
-
-
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka_2.12</artifactId>
       <version>${global_kafka_version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.zookeeper</groupId>
+          <artifactId>zookeeper</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka_2.12</artifactId>
       <version>${global_kafka_version}</version>
       <classifier>test</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.zookeeper</groupId>
+          <artifactId>zookeeper</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
-
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdfs</artifactId>
@@ -195,6 +277,21 @@
           <artifactId>slf4j-log4j12</artifactId>
           <groupId>org.slf4j</groupId>
         </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -247,6 +344,23 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-yarn-server-common</artifactId>
       <version>${global_hadoop_version}</version>
+      <exclusions>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -263,6 +377,21 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/metron-platform/metron-management/pom.xml b/metron-platform/metron-management/pom.xml
index 309a42d43e..d2caf989da 100644
--- a/metron-platform/metron-management/pom.xml
+++ b/metron-platform/metron-management/pom.xml
@@ -123,16 +123,39 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
         <!-- Test -->
 
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>${global_zookeeper_version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-test</artifactId>
-            <version>${global_curator_version}</version>
+            <version>${global_curator_test_version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.metron</groupId>
@@ -156,6 +179,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -171,6 +209,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
             <scope>test</scope>
         </dependency>
diff --git a/metron-platform/metron-parsing/metron-parsers-common/pom.xml b/metron-platform/metron-parsing/metron-parsers-common/pom.xml
index a35fd94951..0ac21c3d64 100644
--- a/metron-platform/metron-parsing/metron-parsers-common/pom.xml
+++ b/metron-platform/metron-parsing/metron-parsers-common/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  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. 
+<!--
+  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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -77,6 +77,16 @@
                     <artifactId>log4j</artifactId>
                     <groupId>log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -176,6 +186,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-pcap-backend/pom.xml b/metron-platform/metron-pcap-backend/pom.xml
index c2cfa2484c..24ff0c3118 100644
--- a/metron-platform/metron-pcap-backend/pom.xml
+++ b/metron-platform/metron-pcap-backend/pom.xml
@@ -36,10 +36,22 @@
             <version>${guava_version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>${global_zookeeper_version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
-            <version>2.10.0</version>
+            <version>${global_curator_version}</version>
+            <exclusions>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.storm</groupId>
@@ -50,12 +62,6 @@
             <groupId>org.apache.metron</groupId>
             <artifactId>metron-common</artifactId>
             <version>${project.parent.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.metron</groupId>
@@ -87,9 +93,15 @@
             <version>${global_hadoop_version}</version>
             <exclusions>
                 <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
@@ -209,6 +221,23 @@
             <artifactId>metron-integration-test</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
+            <exclusions>
+              <exclusion>
+                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <groupId>org.apache.curator</groupId>
+                  <artifactId>curator-framework</artifactId>
+              </exclusion>
+              <exclusion>
+                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <groupId>org.apache.curator</groupId>
+                  <artifactId>curator-client</artifactId>
+              </exclusion>
+              <exclusion>
+                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <groupId>org.apache.curator</groupId>
+                  <artifactId>curator-recipes</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
diff --git a/metron-platform/metron-pcap/pom.xml b/metron-platform/metron-pcap/pom.xml
index b5d0c5fa53..b0d38409c0 100644
--- a/metron-platform/metron-pcap/pom.xml
+++ b/metron-platform/metron-pcap/pom.xml
@@ -121,6 +121,21 @@
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>httpcore</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-solr/metron-solr-common/pom.xml b/metron-platform/metron-solr/metron-solr-common/pom.xml
index 118a9250a2..53db49380d 100644
--- a/metron-platform/metron-solr/metron-solr-common/pom.xml
+++ b/metron-platform/metron-solr/metron-solr-common/pom.xml
@@ -132,6 +132,16 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -193,6 +203,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-test-utilities/pom.xml b/metron-platform/metron-test-utilities/pom.xml
index c651fc7c41..670236e8d1 100644
--- a/metron-platform/metron-test-utilities/pom.xml
+++ b/metron-platform/metron-test-utilities/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  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. 
+<!--
+  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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -51,6 +51,18 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-auth</artifactId>
       <version>${global_hadoop_version}</version>
+      <exclusions>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- need to exclude zookeeper 3.4.9 -->
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -65,6 +77,21 @@
           <artifactId>commons-httpclient</artifactId>
           <groupId>commons-httpclient</groupId>
         </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- need to exclude zookeeper 3.4.9 -->
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -140,11 +167,22 @@
         </exclusion>
       </exclusions>
     </dependency>
-
+    <dependency>
+        <groupId>org.apache.zookeeper</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>${global_zookeeper_version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-test</artifactId>
-      <version>${global_curator_version}</version>
+      <version>${global_curator_test_version}</version>
+      <exclusions>
+          <exclusion>
+              <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+              <groupId>org.apache.zookeeper</groupId>
+              <artifactId>zookeeper</artifactId>
+          </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/metron-platform/metron-writer/metron-writer-common/pom.xml b/metron-platform/metron-writer/metron-writer-common/pom.xml
index 24722f15e5..1ff0eb1c0f 100644
--- a/metron-platform/metron-writer/metron-writer-common/pom.xml
+++ b/metron-platform/metron-writer/metron-writer-common/pom.xml
@@ -47,6 +47,26 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -70,6 +90,21 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
             </exclusions>
             <scope>provided</scope>
         </dependency>
@@ -102,6 +137,11 @@
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-mapreduce-client-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
             </exclusions>
             <scope>provided</scope>
         </dependency>
@@ -131,6 +171,11 @@
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-common</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-writer/metron-writer-storm/pom.xml b/metron-platform/metron-writer/metron-writer-storm/pom.xml
index b1e33a9c75..f11b51f1fa 100644
--- a/metron-platform/metron-writer/metron-writer-storm/pom.xml
+++ b/metron-platform/metron-writer/metron-writer-storm/pom.xml
@@ -63,6 +63,16 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
             <scope>provided</scope>
         </dependency>
diff --git a/metron-platform/metron-zookeeper/pom.xml b/metron-platform/metron-zookeeper/pom.xml
index c9083be055..ebcd43a057 100644
--- a/metron-platform/metron-zookeeper/pom.xml
+++ b/metron-platform/metron-zookeeper/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  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. 
+<!--
+  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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28,15 +28,46 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>${global_zookeeper_version}</version>
+   </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-client</artifactId>
       <version>${global_curator_version}</version>
+      <exclusions>
+          <exclusion>
+              <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+              <groupId>org.apache.zookeeper</groupId>
+              <artifactId>zookeeper</artifactId>
+          </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-recipes</artifactId>
       <version>${global_curator_version}</version>
+      <exclusions>
+          <exclusion>
+              <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+              <groupId>org.apache.zookeeper</groupId>
+              <artifactId>zookeeper</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+      <version>${global_curator_version}</version>
+      <exclusions>
+          <exclusion>
+              <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+              <groupId>org.apache.zookeeper</groupId>
+              <artifactId>zookeeper</artifactId>
+          </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/metron-stellar/stellar-common/pom.xml b/metron-stellar/stellar-common/pom.xml
index 24d13c319b..dbdfdb70bf 100644
--- a/metron-stellar/stellar-common/pom.xml
+++ b/metron-stellar/stellar-common/pom.xml
@@ -30,6 +30,11 @@
         <guava_version>${global_guava_version}</guava_version>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>${global_zookeeper_version}</version>
+        </dependency>
         <dependency>
           <groupId>com.github.ben-manes.caffeine</groupId>
           <artifactId>caffeine</artifactId>
@@ -44,6 +49,26 @@
               <groupId>asm</groupId>
               <artifactId>asm</artifactId>
             </exclusion>
+            <exclusion>
+                <!-- to avoid pulling in curator 2.12.0 -->
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-client</artifactId>
+            </exclusion>
+            <exclusion>
+                <!-- to avoid pulling in curator 2.12.0 -->
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-recipes</artifactId>
+            </exclusion>
+            <exclusion>
+                <!-- to avoid pulling in curator 2.12.0 -->
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-framework</artifactId>
+            </exclusion>
+            <exclusion>
+                <!-- need to exclude zookeeper 3.4.9 -->
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
         <dependency>
@@ -51,6 +76,33 @@
             <artifactId>hadoop-auth</artifactId>
             <version>${global_hadoop_version}</version>
             <scope>test</scope>
+            <exclusions>
+              <exclusion>
+                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <groupId>org.apache.curator</groupId>
+                  <artifactId>curator-client</artifactId>
+              </exclusion>
+              <exclusion>
+                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <groupId>org.apache.curator</groupId>
+                  <artifactId>curator-recipes</artifactId>
+              </exclusion>
+              <exclusion>
+                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <groupId>org.apache.curator</groupId>
+                  <artifactId>curator-framework</artifactId>
+              </exclusion>
+              <exclusion>
+                  <!-- need to exclude zookeeper 3.4.9 -->
+                  <groupId>org.apache.zookeeper</groupId>
+                  <artifactId>zookeeper</artifactId>
+              </exclusion>
+              <exclusion>
+                  <!-- need to exclude zookeeper 3.4.9 -->
+                  <groupId>org.apache.zookeeper</groupId>
+                  <artifactId>zookeeper</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>
@@ -129,20 +181,58 @@
             <version>1.6</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-client</artifactId>
-            <version>${global_curator_version}</version>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>${global_zookeeper_version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
-            <version>${global_curator_version}</version>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>curator-client</artifactId>
+          <version>${global_curator_version}</version>
+          <exclusions>
+              <exclusion>
+                  <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                  <groupId>org.apache.zookeeper</groupId>
+                  <artifactId>zookeeper</artifactId>
+              </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>curator-recipes</artifactId>
+          <version>${global_curator_version}</version>
+          <exclusions>
+              <exclusion>
+                  <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                  <groupId>org.apache.zookeeper</groupId>
+                  <artifactId>zookeeper</artifactId>
+              </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>curator-framework</artifactId>
+          <version>${global_curator_version}</version>
+          <exclusions>
+              <exclusion>
+                  <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                  <groupId>org.apache.zookeeper</groupId>
+                  <artifactId>zookeeper</artifactId>
+              </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-test</artifactId>
-            <version>${global_curator_version}</version>
+            <version>${global_curator_test_version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <!-- need to exclude zookeeper 3.5.x http://curator.apache.org/zk-compatibility.html -->
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.aesh</groupId>
diff --git a/metron-stellar/stellar-zeppelin/pom.xml b/metron-stellar/stellar-zeppelin/pom.xml
index ef54d0d401..f0b2046a10 100644
--- a/metron-stellar/stellar-zeppelin/pom.xml
+++ b/metron-stellar/stellar-zeppelin/pom.xml
@@ -45,6 +45,21 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 308c167ac0..9437439a2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,6 @@
         <global_caffeine_version>2.6.2</global_caffeine_version>
         <global_antlr_version>4.5</global_antlr_version>
         <global_opencsv_version>3.7</global_opencsv_version>
-        <global_curator_version>2.7.1</global_curator_version>
         <global_classindex_version>3.3</global_classindex_version>
         <global_hbase_version>1.1.1</global_hbase_version>
         <global_hbase_guava_version>12.0</global_hbase_guava_version>
@@ -151,6 +150,11 @@
                 <global_solr_version>7.4.0</global_solr_version>
                 <global_hbase_version>2.0.2</global_hbase_version>
                 <global_hbase_guava_version>17.0</global_hbase_guava_version>
+                <!-- For Zookeeper/Curator version compatibility see
+                      http://curator.apache.org/zk-compatibility.html -->
+                <global_zookeeper_version>3.4.6</global_zookeeper_version>
+                <global_curator_version>2.7.1</global_curator_version>
+                <global_curator_test_version>2.7.1</global_curator_test_version>
             </properties>
         </profile>
         <profile>
@@ -167,6 +171,11 @@
                 <global_solr_version>6.6.2</global_solr_version>
                 <global_hbase_version>2.0.2</global_hbase_version>
                 <global_hbase_guava_version>17.0</global_hbase_guava_version>
+                <!-- For Zookeeper/Curator version compatibility see
+                      http://curator.apache.org/zk-compatibility.html -->
+                <global_zookeeper_version>3.4.6</global_zookeeper_version>
+                <global_curator_version>2.7.1</global_curator_version>
+                <global_curator_test_version>2.7.1</global_curator_test_version>
             </properties>
         </profile>
     </profiles>

From c7dbac64d41036c5888c63b18492a9fd0fd9254e Mon Sep 17 00:00:00 2001
From: Nick Allen <nickallen@apache.org>
Date: Thu, 19 Sep 2019 15:33:43 -0400
Subject: [PATCH 2/8] to avoid pulling in curator 2.8.0 with solr 7.4.0

---
 .../metron-solr/metron-solr-storm/pom.xml         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/metron-platform/metron-solr/metron-solr-storm/pom.xml b/metron-platform/metron-solr/metron-solr-storm/pom.xml
index 3d55616fe0..38688fb38d 100644
--- a/metron-platform/metron-solr/metron-solr-storm/pom.xml
+++ b/metron-platform/metron-solr/metron-solr-storm/pom.xml
@@ -56,6 +56,21 @@
                     <artifactId>caffeine</artifactId>
                     <groupId>com.github.ben-manes.caffeine</groupId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.8.0 with solr 7.4.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.8.0 with solr 7.4.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.8.0 with solr 7.4.0 -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

From c0912cde9f385bcdbbd47d839418be926b54be2c Mon Sep 17 00:00:00 2001
From: Nick Allen <nickallen@apache.org>
Date: Thu, 19 Sep 2019 15:39:49 -0400
Subject: [PATCH 3/8] avoid pulling in curator 2.12.0 with storm 1.2.x

---
 .../metron-writer/metron-writer-storm/pom.xml     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/metron-platform/metron-writer/metron-writer-storm/pom.xml b/metron-platform/metron-writer/metron-writer-storm/pom.xml
index f11b51f1fa..310dfe84f2 100644
--- a/metron-platform/metron-writer/metron-writer-storm/pom.xml
+++ b/metron-platform/metron-writer/metron-writer-storm/pom.xml
@@ -125,6 +125,21 @@
                     <groupId>org.mortbay.jetty</groupId>
                     <artifactId>jetty-util</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 with storm 1.2.x -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 with storm 1.2.x -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 with storm 1.2.x -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

From a167f4a9be64d07dd0946c58a50fac7c0d61d572 Mon Sep 17 00:00:00 2001
From: Nick Allen <nickallen@apache.org>
Date: Thu, 19 Sep 2019 15:42:20 -0400
Subject: [PATCH 4/8] in maas-service to avoid pulling in curator 2.12.0 with
 hadoop 3.1.x

---
 metron-analytics/metron-maas-service/pom.xml | 34 ++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/metron-analytics/metron-maas-service/pom.xml b/metron-analytics/metron-maas-service/pom.xml
index 3a17277a71..b6b89166c3 100644
--- a/metron-analytics/metron-maas-service/pom.xml
+++ b/metron-analytics/metron-maas-service/pom.xml
@@ -61,17 +61,17 @@
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x  -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x  -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </exclusion>
@@ -111,6 +111,13 @@
       <artifactId>hadoop-yarn-common</artifactId>
       <version>${hadoop.version}</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -136,17 +143,17 @@
       <scope>provided</scope>
       <exclusions>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x-->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </exclusion>
@@ -231,6 +238,21 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+        </exclusion>
+        <exclusion>
+            <!-- to avoid pulling in curator 2.12.0 -->
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 

From 10594af5fb314a6637d84f7cd3e47c575a09fc7c Mon Sep 17 00:00:00 2001
From: Nick Allen <nickallen@apache.org>
Date: Thu, 19 Sep 2019 15:43:15 -0400
Subject: [PATCH 5/8] Removed duplicate zookeeper dependency from
 stellar-common

---
 metron-stellar/stellar-common/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/metron-stellar/stellar-common/pom.xml b/metron-stellar/stellar-common/pom.xml
index dbdfdb70bf..db629cb776 100644
--- a/metron-stellar/stellar-common/pom.xml
+++ b/metron-stellar/stellar-common/pom.xml
@@ -30,11 +30,6 @@
         <guava_version>${global_guava_version}</guava_version>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>${global_zookeeper_version}</version>
-        </dependency>
         <dependency>
           <groupId>com.github.ben-manes.caffeine</groupId>
           <artifactId>caffeine</artifactId>

From adb4db48aa88685a7889d4f7e0bf62b91ab85893 Mon Sep 17 00:00:00 2001
From: Nick Allen <nickallen@apache.org>
Date: Thu, 19 Sep 2019 16:01:48 -0400
Subject: [PATCH 6/8] Enhanced comments for clarity

---
 metron-analytics/metron-maas-service/pom.xml  | 10 +++----
 .../metron-profiler-spark/pom.xml             |  2 +-
 .../metron-profiler-storm/pom.xml             | 17 +++++++----
 metron-interface/metron-rest/pom.xml          |  6 ++--
 metron-platform/metron-common/pom.xml         | 14 ++++-----
 .../metron-data-management/pom.xml            | 16 +++++-----
 .../metron-elasticsearch-common/pom.xml       |  4 +--
 .../metron-enrichment-storm/pom.xml           | 10 +++----
 metron-platform/metron-hbase-server/pom.xml   | 12 ++++----
 .../metron-hbase/metron-hbase-common/pom.xml  | 10 +++----
 .../metron-indexing-common/pom.xml            |  4 +--
 .../metron-integration-test/pom.xml           | 30 +++++++++----------
 metron-platform/metron-management/pom.xml     | 10 +++----
 .../metron-parsers-common/pom.xml             |  4 +--
 metron-platform/metron-pcap-backend/pom.xml   |  4 +--
 metron-platform/metron-pcap/pom.xml           |  6 ++--
 .../metron-solr/metron-solr-common/pom.xml    |  4 +--
 metron-platform/metron-test-utilities/pom.xml |  4 +--
 .../metron-writer-common/pom.xml              |  8 ++---
 .../metron-writer/metron-writer-storm/pom.xml |  4 +--
 metron-stellar/stellar-common/pom.xml         |  8 ++---
 21 files changed, 96 insertions(+), 91 deletions(-)

diff --git a/metron-analytics/metron-maas-service/pom.xml b/metron-analytics/metron-maas-service/pom.xml
index b6b89166c3..4e81be6617 100644
--- a/metron-analytics/metron-maas-service/pom.xml
+++ b/metron-analytics/metron-maas-service/pom.xml
@@ -66,12 +66,12 @@
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x  -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x  -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </exclusion>
@@ -239,17 +239,17 @@
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </exclusion>
diff --git a/metron-analytics/metron-profiler-spark/pom.xml b/metron-analytics/metron-profiler-spark/pom.xml
index b7fd764595..806e0d3edc 100644
--- a/metron-analytics/metron-profiler-spark/pom.xml
+++ b/metron-analytics/metron-profiler-spark/pom.xml
@@ -34,7 +34,7 @@
           <version>${global_spark_version}</version>
           <exclusions>
               <exclusion>
-                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <!-- to avoid pulling in curator 2.12.0 with spark 2.3.x -->
                   <groupId>org.apache.curator</groupId>
                   <artifactId>curator-recipes</artifactId>
               </exclusion>
diff --git a/metron-analytics/metron-profiler-storm/pom.xml b/metron-analytics/metron-profiler-storm/pom.xml
index 4433f9d139..c34cd151e1 100644
--- a/metron-analytics/metron-profiler-storm/pom.xml
+++ b/metron-analytics/metron-profiler-storm/pom.xml
@@ -68,22 +68,22 @@
                     <artifactId>httpclient</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <!-- need to exclude zookeeper 3.4.9 with hadoop 3.1.x -->
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>zookeeper</artifactId>
                 </exclusion>
@@ -115,15 +115,20 @@
                     <groupId>commons-lang</groupId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-framework</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml
index f261d45b3d..b9e8362167 100644
--- a/metron-interface/metron-rest/pom.xml
+++ b/metron-interface/metron-rest/pom.xml
@@ -251,17 +251,17 @@
               <artifactId>servlet-api</artifactId>
             </exclusion>
             <exclusion>
-                <!-- to avoid pulling in curator 2.12.0 -->
+                <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-framework</artifactId>
             </exclusion>
             <exclusion>
-                <!-- to avoid pulling in curator 2.12.0 -->
+                <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-client</artifactId>
             </exclusion>
             <exclusion>
-                <!-- to avoid pulling in curator 2.12.0 -->
+                <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-recipes</artifactId>
             </exclusion>
diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml
index 0fdd2d907e..023e652b0f 100644
--- a/metron-platform/metron-common/pom.xml
+++ b/metron-platform/metron-common/pom.xml
@@ -258,22 +258,22 @@
                     <groupId>org.slf4j</groupId>
                 </exclusion>
                 <exclusion>
-                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <!-- need to exclude zookeeper 3.4.9 with hadoop 3.1.x -->
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>zookeeper</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
@@ -301,17 +301,17 @@
                     <artifactId>asm</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <!-- need to exclude zookeeper 3.4.9 with hadoop 3.1.x -->
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>zookeeper</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-data-management/pom.xml b/metron-platform/metron-data-management/pom.xml
index 13fc42e808..e8e291fe85 100644
--- a/metron-platform/metron-data-management/pom.xml
+++ b/metron-platform/metron-data-management/pom.xml
@@ -169,17 +169,17 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
@@ -203,12 +203,12 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
@@ -271,17 +271,17 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml b/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml
index 2bbf9809ad..c8fe527a3d 100644
--- a/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml
+++ b/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml
@@ -156,12 +156,12 @@
                     <artifactId>httpcore</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml b/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
index 846bfe052c..062860910f 100644
--- a/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
+++ b/metron-platform/metron-enrichment/metron-enrichment-storm/pom.xml
@@ -133,17 +133,17 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
@@ -240,12 +240,12 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-hbase-server/pom.xml b/metron-platform/metron-hbase-server/pom.xml
index f76e55827c..556ba79198 100644
--- a/metron-platform/metron-hbase-server/pom.xml
+++ b/metron-platform/metron-hbase-server/pom.xml
@@ -133,17 +133,17 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
@@ -234,17 +234,17 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-hbase/metron-hbase-common/pom.xml b/metron-platform/metron-hbase/metron-hbase-common/pom.xml
index 6797d71168..548d976605 100644
--- a/metron-platform/metron-hbase/metron-hbase-common/pom.xml
+++ b/metron-platform/metron-hbase/metron-hbase-common/pom.xml
@@ -70,17 +70,17 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
@@ -115,12 +115,12 @@
                     <artifactId>guava</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-indexing/metron-indexing-common/pom.xml b/metron-platform/metron-indexing/metron-indexing-common/pom.xml
index c81cc0d5a8..2ee67aaa26 100644
--- a/metron-platform/metron-indexing/metron-indexing-common/pom.xml
+++ b/metron-platform/metron-indexing/metron-indexing-common/pom.xml
@@ -119,12 +119,12 @@
                     <groupId>log4j</groupId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-integration-test/pom.xml b/metron-platform/metron-integration-test/pom.xml
index aaf13e69e1..6bb8291332 100644
--- a/metron-platform/metron-integration-test/pom.xml
+++ b/metron-platform/metron-integration-test/pom.xml
@@ -121,17 +121,17 @@
           <artifactId>zookeeper</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </exclusion>
@@ -155,17 +155,17 @@
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </exclusion>
@@ -278,17 +278,17 @@
           <groupId>org.slf4j</groupId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </exclusion>
@@ -346,17 +346,17 @@
       <version>${global_hadoop_version}</version>
       <exclusions>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </exclusion>
@@ -378,17 +378,17 @@
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-client</artifactId>
         </exclusion>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </exclusion>
diff --git a/metron-platform/metron-management/pom.xml b/metron-platform/metron-management/pom.xml
index d2caf989da..ebf4412f90 100644
--- a/metron-platform/metron-management/pom.xml
+++ b/metron-platform/metron-management/pom.xml
@@ -124,12 +124,12 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
@@ -210,17 +210,17 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-parsing/metron-parsers-common/pom.xml b/metron-platform/metron-parsing/metron-parsers-common/pom.xml
index 0ac21c3d64..1e23e9c8c1 100644
--- a/metron-platform/metron-parsing/metron-parsers-common/pom.xml
+++ b/metron-platform/metron-parsing/metron-parsers-common/pom.xml
@@ -78,12 +78,12 @@
                     <groupId>log4j</groupId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-pcap-backend/pom.xml b/metron-platform/metron-pcap-backend/pom.xml
index 24ff0c3118..50da35a2f8 100644
--- a/metron-platform/metron-pcap-backend/pom.xml
+++ b/metron-platform/metron-pcap-backend/pom.xml
@@ -93,12 +93,12 @@
             <version>${global_hadoop_version}</version>
             <exclusions>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-pcap/pom.xml b/metron-platform/metron-pcap/pom.xml
index b0d38409c0..000fb9d0db 100644
--- a/metron-platform/metron-pcap/pom.xml
+++ b/metron-platform/metron-pcap/pom.xml
@@ -122,17 +122,17 @@
                     <artifactId>httpcore</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-solr/metron-solr-common/pom.xml b/metron-platform/metron-solr/metron-solr-common/pom.xml
index 53db49380d..6ecb21422a 100644
--- a/metron-platform/metron-solr/metron-solr-common/pom.xml
+++ b/metron-platform/metron-solr/metron-solr-common/pom.xml
@@ -133,12 +133,12 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-test-utilities/pom.xml b/metron-platform/metron-test-utilities/pom.xml
index 670236e8d1..165db4a43e 100644
--- a/metron-platform/metron-test-utilities/pom.xml
+++ b/metron-platform/metron-test-utilities/pom.xml
@@ -53,12 +53,12 @@
       <version>${global_hadoop_version}</version>
       <exclusions>
         <exclusion>
-            <!-- to avoid pulling in curator 2.12.0 -->
+            <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
         </exclusion>
         <exclusion>
-            <!-- need to exclude zookeeper 3.4.9 -->
+            <!-- need to exclude zookeeper 3.4.9 with hadoop 3.1.x -->
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
         </exclusion>
diff --git a/metron-platform/metron-writer/metron-writer-common/pom.xml b/metron-platform/metron-writer/metron-writer-common/pom.xml
index 1ff0eb1c0f..ca82243550 100644
--- a/metron-platform/metron-writer/metron-writer-common/pom.xml
+++ b/metron-platform/metron-writer/metron-writer-common/pom.xml
@@ -48,22 +48,22 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <!-- need to exclude zookeeper 3.4.9 with hadoop 3.1.x -->
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>zookeeper</artifactId>
                 </exclusion>
diff --git a/metron-platform/metron-writer/metron-writer-storm/pom.xml b/metron-platform/metron-writer/metron-writer-storm/pom.xml
index 310dfe84f2..0c62cb48c0 100644
--- a/metron-platform/metron-writer/metron-writer-storm/pom.xml
+++ b/metron-platform/metron-writer/metron-writer-storm/pom.xml
@@ -64,12 +64,12 @@
                     <artifactId>slf4j-log4j12</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
diff --git a/metron-stellar/stellar-common/pom.xml b/metron-stellar/stellar-common/pom.xml
index db629cb776..6deddff5c6 100644
--- a/metron-stellar/stellar-common/pom.xml
+++ b/metron-stellar/stellar-common/pom.xml
@@ -45,22 +45,22 @@
               <artifactId>asm</artifactId>
             </exclusion>
             <exclusion>
-                <!-- to avoid pulling in curator 2.12.0 -->
+                <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-client</artifactId>
             </exclusion>
             <exclusion>
-                <!-- to avoid pulling in curator 2.12.0 -->
+                <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-recipes</artifactId>
             </exclusion>
             <exclusion>
-                <!-- to avoid pulling in curator 2.12.0 -->
+                <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-framework</artifactId>
             </exclusion>
             <exclusion>
-                <!-- need to exclude zookeeper 3.4.9 -->
+                <!-- need to exclude zookeeper 3.4.9 with hadoop 3.1.x -->
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
             </exclusion>

From c8ca5c273025e298bf9b0acd05ef82dd9a692e81 Mon Sep 17 00:00:00 2001
From: Nick Allen <nickallen@apache.org>
Date: Thu, 19 Sep 2019 16:33:42 -0400
Subject: [PATCH 7/8] No need to exclude curator from metron-integration-test
 any longer

---
 metron-analytics/metron-profiler-spark/pom.xml  | 15 ---------------
 metron-analytics/metron-profiler-storm/pom.xml  | 15 ---------------
 metron-interface/metron-rest/pom.xml            | 15 ---------------
 metron-platform/metron-common/pom.xml           | 15 ---------------
 metron-platform/metron-data-management/pom.xml  | 15 ---------------
 .../metron-elasticsearch-common/pom.xml         | 15 ---------------
 metron-platform/metron-enrichment/pom.xml       | 15 ---------------
 metron-platform/metron-hbase-server/pom.xml     | 15 ---------------
 .../metron-indexing-common/pom.xml              | 15 ---------------
 .../metron-indexing-storm/pom.xml               | 15 ---------------
 metron-platform/metron-management/pom.xml       | 15 ---------------
 .../metron-parsers-common/pom.xml               | 15 ---------------
 metron-platform/metron-pcap-backend/pom.xml     | 17 -----------------
 .../metron-solr/metron-solr-common/pom.xml      | 15 ---------------
 metron-stellar/stellar-zeppelin/pom.xml         | 15 ---------------
 15 files changed, 227 deletions(-)

diff --git a/metron-analytics/metron-profiler-spark/pom.xml b/metron-analytics/metron-profiler-spark/pom.xml
index 806e0d3edc..da8356efb7 100644
--- a/metron-analytics/metron-profiler-spark/pom.xml
+++ b/metron-analytics/metron-profiler-spark/pom.xml
@@ -162,21 +162,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/metron-analytics/metron-profiler-storm/pom.xml b/metron-analytics/metron-profiler-storm/pom.xml
index c34cd151e1..84c0631f5e 100644
--- a/metron-analytics/metron-profiler-storm/pom.xml
+++ b/metron-analytics/metron-profiler-storm/pom.xml
@@ -245,21 +245,6 @@
                     <artifactId>commons-lang</artifactId>
                     <groupId>commons-lang</groupId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml
index b9e8362167..9affafb89e 100644
--- a/metron-interface/metron-rest/pom.xml
+++ b/metron-interface/metron-rest/pom.xml
@@ -464,21 +464,6 @@
                     <groupId>commons-httpclient</groupId>
                     <artifactId>commons-httpclient</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-common/pom.xml b/metron-platform/metron-common/pom.xml
index 023e652b0f..5d6ddaa630 100644
--- a/metron-platform/metron-common/pom.xml
+++ b/metron-platform/metron-common/pom.xml
@@ -111,21 +111,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-data-management/pom.xml b/metron-platform/metron-data-management/pom.xml
index e8e291fe85..07f98cf82b 100644
--- a/metron-platform/metron-data-management/pom.xml
+++ b/metron-platform/metron-data-management/pom.xml
@@ -335,21 +335,6 @@
                     <artifactId>log4j-over-slf4j</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml b/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml
index c8fe527a3d..9f8ddb9076 100644
--- a/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml
+++ b/metron-platform/metron-elasticsearch/metron-elasticsearch-common/pom.xml
@@ -219,21 +219,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-enrichment/pom.xml b/metron-platform/metron-enrichment/pom.xml
index a85a556b1c..1095021e90 100644
--- a/metron-platform/metron-enrichment/pom.xml
+++ b/metron-platform/metron-enrichment/pom.xml
@@ -66,21 +66,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-hbase-server/pom.xml b/metron-platform/metron-hbase-server/pom.xml
index 556ba79198..0f6bd83c90 100644
--- a/metron-platform/metron-hbase-server/pom.xml
+++ b/metron-platform/metron-hbase-server/pom.xml
@@ -206,21 +206,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-indexing/metron-indexing-common/pom.xml b/metron-platform/metron-indexing/metron-indexing-common/pom.xml
index 2ee67aaa26..f118521c17 100644
--- a/metron-platform/metron-indexing/metron-indexing-common/pom.xml
+++ b/metron-platform/metron-indexing/metron-indexing-common/pom.xml
@@ -157,21 +157,6 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
             <exclusions>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
diff --git a/metron-platform/metron-indexing/metron-indexing-storm/pom.xml b/metron-platform/metron-indexing/metron-indexing-storm/pom.xml
index 7cf6c5c901..ce3fb30cb8 100644
--- a/metron-platform/metron-indexing/metron-indexing-storm/pom.xml
+++ b/metron-platform/metron-indexing/metron-indexing-storm/pom.xml
@@ -75,21 +75,6 @@
                     <groupId>io.netty</groupId>
                     <artifactId>netty-all</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-management/pom.xml b/metron-platform/metron-management/pom.xml
index ebf4412f90..d081c0144f 100644
--- a/metron-platform/metron-management/pom.xml
+++ b/metron-platform/metron-management/pom.xml
@@ -179,21 +179,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-parsing/metron-parsers-common/pom.xml b/metron-platform/metron-parsing/metron-parsers-common/pom.xml
index 1e23e9c8c1..c23cfac777 100644
--- a/metron-platform/metron-parsing/metron-parsers-common/pom.xml
+++ b/metron-platform/metron-parsing/metron-parsers-common/pom.xml
@@ -186,21 +186,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-platform/metron-pcap-backend/pom.xml b/metron-platform/metron-pcap-backend/pom.xml
index 50da35a2f8..a9dd765e05 100644
--- a/metron-platform/metron-pcap-backend/pom.xml
+++ b/metron-platform/metron-pcap-backend/pom.xml
@@ -221,23 +221,6 @@
             <artifactId>metron-integration-test</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
-            <exclusions>
-              <exclusion>
-                  <!-- to avoid pulling in curator 2.12.0 -->
-                  <groupId>org.apache.curator</groupId>
-                  <artifactId>curator-framework</artifactId>
-              </exclusion>
-              <exclusion>
-                  <!-- to avoid pulling in curator 2.12.0 -->
-                  <groupId>org.apache.curator</groupId>
-                  <artifactId>curator-client</artifactId>
-              </exclusion>
-              <exclusion>
-                  <!-- to avoid pulling in curator 2.12.0 -->
-                  <groupId>org.apache.curator</groupId>
-                  <artifactId>curator-recipes</artifactId>
-              </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
diff --git a/metron-platform/metron-solr/metron-solr-common/pom.xml b/metron-platform/metron-solr/metron-solr-common/pom.xml
index 6ecb21422a..a2bfe76cdd 100644
--- a/metron-platform/metron-solr/metron-solr-common/pom.xml
+++ b/metron-platform/metron-solr/metron-solr-common/pom.xml
@@ -203,21 +203,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/metron-stellar/stellar-zeppelin/pom.xml b/metron-stellar/stellar-zeppelin/pom.xml
index f0b2046a10..ef54d0d401 100644
--- a/metron-stellar/stellar-zeppelin/pom.xml
+++ b/metron-stellar/stellar-zeppelin/pom.xml
@@ -45,21 +45,6 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
-                    <groupId>org.apache.curator</groupId>
-                    <artifactId>curator-recipes</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

From 6fb6921c852093754b202635de0f63ea6c28d9f1 Mon Sep 17 00:00:00 2001
From: Nick Allen <nickallen@apache.org>
Date: Thu, 19 Sep 2019 16:42:14 -0400
Subject: [PATCH 8/8] Comment changes only

---
 .../metron-writer/metron-writer-common/pom.xml            | 6 +++---
 metron-stellar/stellar-common/pom.xml                     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/metron-platform/metron-writer/metron-writer-common/pom.xml b/metron-platform/metron-writer/metron-writer-common/pom.xml
index ca82243550..3a5ef9f284 100644
--- a/metron-platform/metron-writer/metron-writer-common/pom.xml
+++ b/metron-platform/metron-writer/metron-writer-common/pom.xml
@@ -91,17 +91,17 @@
                     <artifactId>guava</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-client</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- to avoid pulling in curator 2.12.0 -->
+                    <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-recipes</artifactId>
                 </exclusion>
                 <exclusion>
-                    <!-- need to exclude zookeeper 3.4.9 -->
+                    <!-- need to exclude zookeeper 3.4.9 with hadoop 3.1.x -->
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>zookeeper</artifactId>
                 </exclusion>
diff --git a/metron-stellar/stellar-common/pom.xml b/metron-stellar/stellar-common/pom.xml
index 6deddff5c6..584b27cb35 100644
--- a/metron-stellar/stellar-common/pom.xml
+++ b/metron-stellar/stellar-common/pom.xml
@@ -73,22 +73,22 @@
             <scope>test</scope>
             <exclusions>
               <exclusion>
-                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                   <groupId>org.apache.curator</groupId>
                   <artifactId>curator-client</artifactId>
               </exclusion>
               <exclusion>
-                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                   <groupId>org.apache.curator</groupId>
                   <artifactId>curator-recipes</artifactId>
               </exclusion>
               <exclusion>
-                  <!-- to avoid pulling in curator 2.12.0 -->
+                  <!-- to avoid pulling in curator 2.12.0 with hadoop 3.1.x -->
                   <groupId>org.apache.curator</groupId>
                   <artifactId>curator-framework</artifactId>
               </exclusion>
               <exclusion>
-                  <!-- need to exclude zookeeper 3.4.9 -->
+                  <!-- need to exclude zookeeper 3.4.9 with hadoop 3.1.x -->
                   <groupId>org.apache.zookeeper</groupId>
                   <artifactId>zookeeper</artifactId>
               </exclusion>