From 962de72681e5675115922d7e6f8e49f3f99c8826 Mon Sep 17 00:00:00 2001 From: PorterZhang2021 Date: Wed, 17 Apr 2024 15:41:07 +0800 Subject: [PATCH] [KYUUBI #6294] Simplify Netty and gRPC dependency management MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # :mag: Description ## Issue References ๐Ÿ”— This pull request fixes #6294 ## Describe Your Solution ๐Ÿ”ง The netty jars come from `grpc-netty`, `arrow-memory-netty`, use `netty-bom` and `grpc-bom` to simplify the dependency management. Run `./build/dependency.sh --replace` ## Types of changes :bookmark: - [ ] Bugfix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Test Plan ๐Ÿงช #### Behavior Without This Pull Request :coffin: #### Behavior With This Pull Request :tada: #### Related Unit Tests --- # Checklist ๐Ÿ“ - [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html) **Be nice. Be informative.** Closes #6310 from PorterZhang2021/issue-6294. Closes #6294 327030170 [Cheng Pan] simplify netty dependency management cdb435d01 [PorterZhang2021] [# 6294] Prune unused Netty libraries e0676ed5a [PorterZhang2021] Finished Prune unused Netty libraries [#6294] Lead-authored-by: PorterZhang2021 Co-authored-by: Cheng Pan Signed-off-by: Cheng Pan --- dev/dependencyList | 1 - kyuubi-server/pom.xml | 5 -- pom.xml | 202 ++---------------------------------------- 3 files changed, 8 insertions(+), 200 deletions(-) diff --git a/dev/dependencyList b/dev/dependencyList index 1f6cddea5c7..1e4eae6108c 100644 --- a/dev/dependencyList +++ b/dev/dependencyList @@ -137,7 +137,6 @@ metrics-jmx/4.2.23//metrics-jmx-4.2.23.jar metrics-json/4.2.23//metrics-json-4.2.23.jar metrics-jvm/4.2.23//metrics-jvm-4.2.23.jar mimepull/1.9.15//mimepull-1.9.15.jar -netty-all/4.1.100.Final//netty-all-4.1.100.Final.jar netty-buffer/4.1.100.Final//netty-buffer-4.1.100.Final.jar netty-codec-dns/4.1.100.Final//netty-codec-dns-4.1.100.Final.jar netty-codec-http/4.1.100.Final//netty-codec-http-4.1.100.Final.jar diff --git a/kyuubi-server/pom.xml b/kyuubi-server/pom.xml index 043ff26b883..f004d91a0ac 100644 --- a/kyuubi-server/pom.xml +++ b/kyuubi-server/pom.xml @@ -109,11 +109,6 @@ kubernetes-httpclient-okhttp - - io.netty - netty-all - - io.swagger.core.v3 swagger-jaxrs2 diff --git a/pom.xml b/pom.xml index 4c482eb3a49..278657dbad8 100644 --- a/pom.xml +++ b/pom.xml @@ -774,172 +774,6 @@ - - io.netty - netty-all - ${netty.version} - - - io.netty - netty-codec-haproxy - - - io.netty - netty-codec-memcache - - - io.netty - netty-codec-mqtt - - - io.netty - netty-codec-redis - - - io.netty - netty-codec-smtp - - - io.netty - netty-codec-stomp - - - io.netty - netty-codec-xml - - - io.netty - netty-handler-ssl-ocsp - - - io.netty - netty-resolver-dns-classes-macos - - - io.netty - netty-resolver-dns-native-macos - - - io.netty - netty-transport-classes-kqueue - - - io.netty - netty-transport-native-kqueue - - - io.netty - netty-transport-rxtx - - - io.netty - netty-transport-sctp - - - io.netty - netty-transport-udt - - - - - - io.netty - netty-buffer - ${netty.version} - - - - io.netty - netty-codec-dns - ${netty.version} - - - - io.netty - netty-codec-http - ${netty.version} - - - - io.netty - netty-codec-http2 - ${netty.version} - - - - io.netty - netty-codec-socks - ${netty.version} - - - - io.netty - netty-codec - ${netty.version} - - - - io.netty - netty-common - ${netty.version} - - - - io.netty - netty-handler-proxy - ${netty.version} - - - - io.netty - netty-handler - ${netty.version} - - - - io.netty - netty-resolver-dns - ${netty.version} - - - - io.netty - netty-resolver - ${netty.version} - - - - io.netty - netty-transport - ${netty.version} - - - - io.netty - netty-transport-classes-epoll - ${netty.version} - - - - io.netty - netty-transport-native-epoll - ${netty.version} - linux-aarch_64 - - - - io.netty - netty-transport-native-epoll - ${netty.version} - linux-x86_64 - - - - io.netty - netty-transport-native-unix-common - ${netty.version} - - jakarta.servlet jakarta.servlet-api @@ -1076,38 +910,18 @@ io.grpc - grpc-core + grpc-bom ${grpc.version} + pom + import - io.grpc - grpc-grpclb - ${grpc.version} - - - - io.grpc - grpc-netty - ${grpc.version} - - - - io.grpc - grpc-protobuf - ${grpc.version} - - - - io.grpc - grpc-stub - ${grpc.version} - - - - io.grpc - grpc-util - ${grpc.version} + io.netty + netty-bom + ${netty.version} + pom + import