Add back shaded netty within grpc

### What changes are proposed in this pull request? add back netty dependency within grpc ### Why are the changes needed? previously we exclude netty dependency since we already have netty-all outside #9942 But due to grpc/grpc-java#11284, we sometimes have incompatibility between grpc and netty, and it's better to use shaded netty within grpc so we can be sure that they are compatible. ### Does this PR introduce any user facing changes? na pr-link: #18642 change-id: cid-65d86f315e023592060b6a9f864bfe2a972dfe68
Alluxio · Jul 1, 2024 · 05d2537 · 05d2537
1 parent efed93c
commit 05d2537
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/dora/tests/testcontainers/src/test/java/alluxio/membership/MembershipManagerTest.java b/dora/tests/testcontainers/src/test/java/alluxio/membership/MembershipManagerTest.java
@@ -82,7 +82,7 @@ public static void init() {
 
   @ClassRule
   public static final GenericContainer<?> ETCD_CONTAINER =
-      new GenericContainer<>("quay.io/coreos/etcd:latest")
+      new GenericContainer<>("quay.io/coreos/etcd:v3.5.13")
           .withCommand("etcd",
               "--listen-client-urls", "http://0.0.0.0:" + ETCD_PORT,
               "--advertise-client-urls", "http://0.0.0.0:" + ETCD_PORT)

diff --git a/pom.xml b/pom.xml
@@ -416,12 +416,6 @@
         <groupId>io.grpc</groupId>
         <artifactId>grpc-netty</artifactId>
         <version>${grpc.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>