From 3f77f5364b540f4e1da98e98636b9681db9c463c Mon Sep 17 00:00:00 2001
From: chenhang <chenhang@apache.org>
Date: Mon, 18 Mar 2024 15:11:26 +0800
Subject: [PATCH] Remove unused dependencies

(cherry picked from commit 174c90d33ac523af3cbce11a1f1f6a258ccd0139)
---
 bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt    | 4 ----
 bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt  | 2 --
 bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 2 --
 metadata-drivers/etcd/pom.xml                             | 8 ++++++++
 stream/common/pom.xml                                     | 8 ++++++++
 stream/tests-common/pom.xml                               | 8 ++++++++
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index aa063de2376..cb7ac95f2d3 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -278,14 +278,10 @@ Apache Software License, Version 2.
 - lib/io.grpc-grpc-protobuf-1.54.1.jar [33]
 - lib/io.grpc-grpc-protobuf-lite-1.54.1.jar [33]
 - lib/io.grpc-grpc-services-1.54.1.jar [33]
-- lib/io.grpc-grpc-servlet-1.54.1.jar[33]
-- lib/io.grpc-grpc-servlet-jakarta-1.54.1.jar[33]
 - lib/io.grpc-grpc-stub-1.54.1.jar [33]
 - lib/io.grpc-grpc-testing-1.54.1.jar [33]
 - lib/io.grpc-grpc-xds-1.54.1.jar [33]
 - lib/io.grpc-grpc-rls-1.54.1.jar[33]
-- lib/io.grpc-grpc-servlet-1.54.1.jar[33]
-- lib/io.grpc-grpc-servlet-jakarta-1.54.1.jar[33]
 - lib/org.apache.curator-curator-client-5.1.0.jar [34]
 - lib/org.apache.curator-curator-framework-5.1.0.jar [34]
 - lib/org.apache.curator-curator-recipes-5.1.0.jar [34]
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index d72cb686eb2..2b1a857bacd 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -257,8 +257,6 @@ Apache Software License, Version 2.
 - lib/io.grpc-grpc-protobuf-1.54.1.jar [32]
 - lib/io.grpc-grpc-protobuf-lite-1.54.1.jar [32]
 - lib/io.grpc-grpc-services-1.54.1.jar [32]
-- lib/io.grpc-grpc-servlet-1.54.1.jar[33]
-- lib/io.grpc-grpc-servlet-jakarta-1.54.1.jar[33]
 - lib/io.grpc-grpc-stub-1.54.1.jar [32]
 - lib/io.grpc-grpc-testing-1.54.1.jar [32]
 - lib/io.grpc-grpc-xds-1.54.1.jar [32]
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index fa1f4ae4ff7..8b5c823e1c4 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -278,8 +278,6 @@ Apache Software License, Version 2.
 - lib/io.grpc-grpc-protobuf-1.54.1.jar [33]
 - lib/io.grpc-grpc-protobuf-lite-1.54.1.jar [33]
 - lib/io.grpc-grpc-services-1.54.1.jar [33]
-- lib/io.grpc-grpc-servlet-1.54.1.jar[33]
-- lib/io.grpc-grpc-servlet-jakarta-1.54.1.jar[33]
 - lib/io.grpc-grpc-stub-1.54.1.jar [33]
 - lib/io.grpc-grpc-testing-1.54.1.jar [33]
 - lib/io.grpc-grpc-xds-1.54.1.jar [33]
diff --git a/metadata-drivers/etcd/pom.xml b/metadata-drivers/etcd/pom.xml
index 2023daf5b87..ce500e59f00 100644
--- a/metadata-drivers/etcd/pom.xml
+++ b/metadata-drivers/etcd/pom.xml
@@ -58,6 +58,14 @@
           <groupId>io.grpc</groupId>
           <artifactId>grpc-okhttp</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-servlet</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-servlet-jakarta</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/stream/common/pom.xml b/stream/common/pom.xml
index f6decbad4c6..bc50ca5572d 100644
--- a/stream/common/pom.xml
+++ b/stream/common/pom.xml
@@ -52,6 +52,14 @@
           <groupId>io.grpc</groupId>
           <artifactId>grpc-okhttp</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-servlet</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-servlet-jakarta</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml
index bb1710a2992..a4152e7df21 100644
--- a/stream/tests-common/pom.xml
+++ b/stream/tests-common/pom.xml
@@ -44,6 +44,14 @@
           <groupId>io.grpc</groupId>
           <artifactId>grpc-okhttp</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-servlet</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>io.grpc</groupId>
+          <artifactId>grpc-servlet-jakarta</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>