From c313a21f2fe9f088a9f31107bcfef10c88c593c3 Mon Sep 17 00:00:00 2001
From: birdstorm <samuelwyf@hotmail.com>
Date: Thu, 11 Nov 2021 18:39:43 +0800
Subject: [PATCH] Update gRPC version to 1.41.0 (#318)

* update grpc version to 1.38.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 2f7f7b9d26..c39f993fe7 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.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>
         <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 9435e9d69d..f6767d7e60 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 class ChannelFactory implements AutoCloseable {
           // 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();
         });