From 937da1cd058781624af56b8ace863abd23c18d7f Mon Sep 17 00:00:00 2001
From: imbajin <jin@apache.org>
Date: Thu, 19 Sep 2024 17:05:27 +0800
Subject: [PATCH] fix conflicts

---
 hugegraph-commons/hugegraph-rpc/pom.xml | 12 ++++++++++++
 hugegraph-server/hugegraph-api/pom.xml  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/hugegraph-commons/hugegraph-rpc/pom.xml b/hugegraph-commons/hugegraph-rpc/pom.xml
index 330618d82c..6ed9cba2bd 100644
--- a/hugegraph-commons/hugegraph-rpc/pom.xml
+++ b/hugegraph-commons/hugegraph-rpc/pom.xml
@@ -120,6 +120,18 @@
                     <artifactId>jackson-databind</artifactId>
                     <groupId>com.fasterxml.jackson.core</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>netty-all</artifactId>
+                    <groupId>io.netty</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-lang3</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>protobuf-java</artifactId>
+                    <groupId>com.google.protobuf</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/hugegraph-server/hugegraph-api/pom.xml b/hugegraph-server/hugegraph-api/pom.xml
index 8a6fdb9e77..cb5d2a9f50 100644
--- a/hugegraph-server/hugegraph-api/pom.xml
+++ b/hugegraph-server/hugegraph-api/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
-            <version>1.47.0</version>
+            <version>1.39.0</version>
         </dependency>
 
         <dependency>