From 84a3992baa549dab9982752a30de40fa99910451 Mon Sep 17 00:00:00 2001
From: Keith Ratcliffe <ratcliffe.keith@gmail.com>
Date: Thu, 14 Nov 2024 23:38:13 +0000
Subject: [PATCH] Fixes #2626: Update ZK exclusions to encompass ZK-Jute

---
 pom.xml              | 22 ++++++++++++++++++++--
 warehouse/pom.xml    |  4 ++++
 web-services/pom.xml |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 56b8c966e4..f46c09e535 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,7 +539,7 @@
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.zookeeper</groupId>
-                        <artifactId>zookeeper</artifactId>
+                        <artifactId>*</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -557,6 +557,10 @@
                         <groupId>com.google.guava</groupId>
                         <artifactId>guava</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.zookeeper</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -568,6 +572,10 @@
                         <groupId>com.google.guava</groupId>
                         <artifactId>guava</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.zookeeper</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -583,6 +591,10 @@
                         <groupId>org.apache.hadoop</groupId>
                         <artifactId>hadoop-client</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.zookeeper</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -600,6 +612,12 @@
                 <groupId>org.apache.accumulo</groupId>
                 <artifactId>accumulo-tserver</artifactId>
                 <version>${version.accumulo}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.zookeeper</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.avro</groupId>
@@ -648,7 +666,7 @@
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.zookeeper</groupId>
-                        <artifactId>zookeeper</artifactId>
+                        <artifactId>*</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
diff --git a/warehouse/pom.xml b/warehouse/pom.xml
index 2cdbeb122f..8c54786915 100644
--- a/warehouse/pom.xml
+++ b/warehouse/pom.xml
@@ -217,6 +217,10 @@
                         <groupId>org.apache.hadoop</groupId>
                         <artifactId>hadoop-client</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.zookeeper</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
diff --git a/web-services/pom.xml b/web-services/pom.xml
index 1acd2fa7ed..3cd7bbfd68 100644
--- a/web-services/pom.xml
+++ b/web-services/pom.xml
@@ -233,7 +233,7 @@
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.zookeeper</groupId>
-                        <artifactId>zookeeper</artifactId>
+                        <artifactId>*</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>junit</groupId>