From 2b52683a188e2aade026ecaf41dc483f37e22526 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 1 Nov 2022 09:30:14 +0100
Subject: Move zookeeper and netty dependency management to parent pom.

---
 parent/pom.xml                        | 45 +++++++++++++++++++++++++++++++++++
 zkfacade/pom.xml                      | 19 ---------------
 zookeeper-client-common/pom.xml       | 11 ---------
 zookeeper-command-line-client/pom.xml | 12 ----------
 4 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 53a3cbdc0d6..a2b91429f0c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -471,6 +471,29 @@
                 <artifactId>expect4j</artifactId>
                 <version>1.6</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+                <version>${zookeeper.client.version}</version>
+                <exclusions>
+                    <!--
+                      Container provides wiring for all common log libraries
+                      Duplicate embedding results in various warnings being printed to stderr
+                     -->
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <!-- Needed by zookeeper, which has an optional dependency.
                      Version must be the same as the one zk uses - check the zk pom file.  -->
@@ -479,6 +502,26 @@
                 <!-- No version property, as we don't want maven-dependency-plugin to alert about newer versions. -->
                 <version>3.1.9</version>
             </dependency>
+            <dependency> <!-- Control netty-all version -->
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency> <!-- Control netty-handler version -->
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency> <!-- Control netty-transport-native-epoll version -->
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-epoll</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency> <!-- Control netty-handler version -->
+                <groupId>io.netty</groupId>
+                <artifactId>netty-tcnative-classes</artifactId>
+                <version>${netty-tcnative.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.github.tomakehurst</groupId>
                 <artifactId>wiremock-jre8-standalone</artifactId>
@@ -1073,6 +1116,8 @@
         <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <mockito.version>4.0.0</mockito.version>
+        <netty.version>4.1.84.Final</netty.version>
+        <netty-tcnative.version>2.0.54.Final</netty-tcnative.version>
         <nimbus.version>9.25.6</nimbus.version>
         <onnxruntime.version>1.12.1</onnxruntime.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml -->
         <org.json.version>20220320</org.json.version>
diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml
index 41053585185..5303c791e15 100644
--- a/zkfacade/pom.xml
+++ b/zkfacade/pom.xml
@@ -65,25 +65,6 @@
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
-      <version>${zookeeper.client.version}</version>
-      <exclusions>
-        <!--
-          Container provides wiring for all common log libraries
-          Duplicate embedding results in various warnings being printed to stderr
-         -->
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- snappy-java and metrics-core are included here
      to be able to work with ZooKeeper >= 3.6.2 due to
diff --git a/zookeeper-client-common/pom.xml b/zookeeper-client-common/pom.xml
index c3dc4629702..f9592a007d1 100644
--- a/zookeeper-client-common/pom.xml
+++ b/zookeeper-client-common/pom.xml
@@ -23,18 +23,7 @@
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
-      <version>${zookeeper.client.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- compile scope -->
diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml
index a0c268e0f95..ae3f5b3bfa1 100644
--- a/zookeeper-command-line-client/pom.xml
+++ b/zookeeper-command-line-client/pom.xml
@@ -14,18 +14,6 @@
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
-      <version>${zookeeper.client.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <!-- This is the log4j 1.2 binding for slf4j. Must not be used with log4j-over-slf4j (see below) -->
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-- 
cgit v1.2.3