From 44e2c59e847de79b74907b218b377a4c429ac9ce Mon Sep 17 00:00:00 2001
From: birdstorm <samuelwyf@hotmail.com>
Date: Mon, 8 Nov 2021 17:13:31 +0800
Subject: [PATCH 1/2] update grpc version to 1.41.0

Signed-off-by: birdstorm <samuelwyf@hotmail.com>
---
 pom.xml                                                | 8 +++++++-
 src/main/java/org/tikv/common/util/ChannelFactory.java | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e9ed7110ac..ad44ea9c70c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,8 @@
         <protobuf.version>3.5.1</protobuf.version>
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.16</slf4j.version>
-        <grpc.version>1.24.0</grpc.version>
+        <grpc.version>1.41.0</grpc.version>
+        <gson.version>2.8.5</gson.version>
         <powermock.version>1.6.6</powermock.version>
         <jackson.version>2.10.0</jackson.version>
         <trove4j.version>3.0.1</trove4j.version>
@@ -137,6 +138,11 @@
             <version>${grpc.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
diff --git a/src/main/java/org/tikv/common/util/ChannelFactory.java b/src/main/java/org/tikv/common/util/ChannelFactory.java
index 9435e9d69d7..f6767d7e602 100644
--- a/src/main/java/org/tikv/common/util/ChannelFactory.java
+++ b/src/main/java/org/tikv/common/util/ChannelFactory.java
@@ -51,7 +51,7 @@ public ManagedChannel getChannel(String addressStr, HostMapping hostMapping) {
           // So a coarse grain lock is ok here
           return ManagedChannelBuilder.forAddress(mappedAddr.getHost(), mappedAddr.getPort())
               .maxInboundMessageSize(maxFrameSize)
-              .usePlaintext(true)
+              .usePlaintext()
               .idleTimeout(60, TimeUnit.SECONDS)
               .build();
         });

From 38e0e4c8b9359500820b4f5ab1a79d7d0c590600 Mon Sep 17 00:00:00 2001
From: birdstorm <samuelwyf@hotmail.com>
Date: Wed, 10 Nov 2021 18:58:39 +0800
Subject: [PATCH 2/2] downgrade to 1.38.0

Signed-off-by: birdstorm <samuelwyf@hotmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ad44ea9c70c..dbc5c5ac6e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <protobuf.version>3.5.1</protobuf.version>
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.16</slf4j.version>
-        <grpc.version>1.41.0</grpc.version>
+        <grpc.version>1.38.0</grpc.version>
         <gson.version>2.8.5</gson.version>
         <powermock.version>1.6.6</powermock.version>
         <jackson.version>2.10.0</jackson.version>