From 51a540dc9490920df08de720df786ee88a7af948 Mon Sep 17 00:00:00 2001
From: Liangliang Gu <marsishandsome@gmail.com>
Date: Thu, 10 Feb 2022 16:59:16 +0800
Subject: [PATCH 1/2] cherry pick #508 to release-3.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index f50de0e1a80..f772c433e32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,12 @@
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.16</slf4j.version>
         <grpc.version>1.38.0</grpc.version>
+<<<<<<< HEAD
         <gson.version>2.8.5</gson.version>
+=======
+        <netty.tcnative.version>2.0.34.Final</netty.tcnative.version>
+        <gson.version>2.8.9</gson.version>
+>>>>>>> 06135c26d... update google-gson to 2.8.9 (#508)
         <powermock.version>1.6.6</powermock.version>
         <jackson.version>2.10.5</jackson.version>
         <jackson.databind.version>2.10.5.1</jackson.databind.version>

From 660aaf1b7540debdb5851b0656c1aa41f285b96c Mon Sep 17 00:00:00 2001
From: Liangliang Gu <marsishandsome@gmail.com>
Date: Thu, 10 Feb 2022 17:01:18 +0800
Subject: [PATCH 2/2] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index f772c433e32..91c197f9e2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,12 +63,7 @@
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.16</slf4j.version>
         <grpc.version>1.38.0</grpc.version>
-<<<<<<< HEAD
-        <gson.version>2.8.5</gson.version>
-=======
-        <netty.tcnative.version>2.0.34.Final</netty.tcnative.version>
         <gson.version>2.8.9</gson.version>
->>>>>>> 06135c26d... update google-gson to 2.8.9 (#508)
         <powermock.version>1.6.6</powermock.version>
         <jackson.version>2.10.5</jackson.version>
         <jackson.databind.version>2.10.5.1</jackson.databind.version>