From 36aac71e5e6135da30b43cbc6da018650b582bf6 Mon Sep 17 00:00:00 2001
From: yelusion <97278661+yelusion2@users.noreply.github.com>
Date: Mon, 8 Jan 2024 16:18:42 +0800
Subject: [PATCH] replace grpc-netty to grpc-netty-shared (#735)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: “yelusion” <xun.huang@zilliz.com>
---
 pom.xml                                                |  2 +-
 .../java/io/milvus/client/MilvusServiceClient.java     | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac5cdd80e..dab3646fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
     <dependencies>
         <dependency>
             <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
+            <artifactId>grpc-netty-shaded</artifactId>
             <version>${grpc.version}</version>
         </dependency>
         <dependency>
diff --git a/src/main/java/io/milvus/client/MilvusServiceClient.java b/src/main/java/io/milvus/client/MilvusServiceClient.java
index f54d50187..c763e6dfc 100644
--- a/src/main/java/io/milvus/client/MilvusServiceClient.java
+++ b/src/main/java/io/milvus/client/MilvusServiceClient.java
@@ -21,6 +21,9 @@
 
 import io.grpc.*;
 import io.grpc.Status;
+import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
 import io.grpc.stub.MetadataUtils;
 import io.milvus.exception.MilvusException;
 import io.milvus.exception.ServerException;
@@ -60,10 +63,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.Callable;
 
-import io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.NettyChannelBuilder;
-import io.netty.handler.ssl.SslContext;
-
+import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
 
 public class MilvusServiceClient extends AbstractMilvusGrpcClient {