From ad283319e1df19a2b0dd7db998b0a97097dd5171 Mon Sep 17 00:00:00 2001
From: Jianjian <jja725@gmail.com>
Date: Mon, 1 Jul 2024 13:20:25 -0700
Subject: [PATCH 1/2] add shaded netty as dependency

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index f369b0f884c1..14a8b5340f9b 100644
--- 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>

From f50e281c093521ac90b5fd2b1fb469e8d5544968 Mon Sep 17 00:00:00 2001
From: Jianjian <jja725@gmail.com>
Date: Mon, 1 Jul 2024 14:07:59 -0700
Subject: [PATCH 2/2] fix test

---
 .../src/test/java/alluxio/membership/MembershipManagerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dora/tests/testcontainers/src/test/java/alluxio/membership/MembershipManagerTest.java b/dora/tests/testcontainers/src/test/java/alluxio/membership/MembershipManagerTest.java
index 08b0c972b189..0a393ecff656 100644
--- 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)