From 82f584faa3cd7dfa34a38e134f32d3096ad5fa95 Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Thu, 14 Dec 2023 14:15:23 +0100
Subject: Restore original ZK embed placements, and duplicate ClientX509Util
 instead

---
 zookeeper-client-common/pom.xml | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'zookeeper-client-common')

diff --git a/zookeeper-client-common/pom.xml b/zookeeper-client-common/pom.xml
index 77451c5bec0..ccfdbd9a429 100644
--- a/zookeeper-client-common/pom.xml
+++ b/zookeeper-client-common/pom.xml
@@ -27,8 +27,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -39,21 +39,6 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-      <scope>compile</scope>
-      <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>
-      </exclusions>
-    </dependency>
 
     <!-- test scope -->
     <dependency>
-- 
cgit v1.2.3