From b7a916403764fa82609a4d007953aae15c11a62b Mon Sep 17 00:00:00 2001 From: Hang Chen Date: Mon, 18 Mar 2024 17:12:11 +0800 Subject: [PATCH] Remove unused dependencies (#4233) ### Motivation The PR #4232 upgrade grpc version to fix CVEs, but it introduced two unused dependencies. I pushed this PR to remove them --- 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 @@ io.grpc grpc-okhttp + + io.grpc + grpc-servlet + + + io.grpc + grpc-servlet-jakarta + 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 @@ io.grpc grpc-okhttp + + io.grpc + grpc-servlet + + + io.grpc + grpc-servlet-jakarta + 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 @@ io.grpc grpc-okhttp + + io.grpc + grpc-servlet + + + io.grpc + grpc-servlet-jakarta +