Remove unused dependencies (apache#4233)

### Motivation The PR apache#4232 upgrade grpc version to fix CVEs, but it introduced two unused dependencies. I pushed this PR to remove them
streamnative · Mar 18, 2024 · b7a9164 · b7a9164
1 parent 553fcdd
commit b7a9164
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>