From ae81d8df93eb2e19e83482b300614cfd0059bd85 Mon Sep 17 00:00:00 2001
From: iosmanthus <dengliming@pingcap.com>
Date: Thu, 7 Apr 2022 18:11:24 +0800
Subject: [PATCH 1/2] cherry pick #584 to release-3.1

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

diff --git a/pom.xml b/pom.xml
index 98cb54a6421..8492e1fbacf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,13 @@
         <grpc.version>1.38.0</grpc.version>
         <gson.version>2.8.9</gson.version>
         <powermock.version>1.6.6</powermock.version>
+<<<<<<< HEAD
         <jackson.version>2.10.5</jackson.version>
         <jackson.databind.version>2.10.5.1</jackson.databind.version>
+=======
+        <jackson-annotations.version>2.13.2</jackson-annotations.version>
+        <jackson.version>2.13.2.2</jackson.version>
+>>>>>>> 7fa24c320... [close #567] upgrade jackson-databind to 2.13.2.2 to fix CVE-2020-36518 (#584)
         <trove4j.version>3.0.1</trove4j.version>
         <jetcd.version>0.4.1</jetcd.version>
         <joda-time.version>2.9.9</joda-time.version>
@@ -179,7 +184,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
+            <version>${jackson-annotations.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

From f7b2c9cbfa829308639ab021d097e0ae8ae0b19d Mon Sep 17 00:00:00 2001
From: iosmanthus <myosmanthustree@gmail.com>
Date: Thu, 7 Apr 2022 18:32:47 +0800
Subject: [PATCH 2/2] fix conflict for jackson-databind version

Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8492e1fbacf..b289674efb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,13 +65,8 @@
         <grpc.version>1.38.0</grpc.version>
         <gson.version>2.8.9</gson.version>
         <powermock.version>1.6.6</powermock.version>
-<<<<<<< HEAD
-        <jackson.version>2.10.5</jackson.version>
-        <jackson.databind.version>2.10.5.1</jackson.databind.version>
-=======
         <jackson-annotations.version>2.13.2</jackson-annotations.version>
         <jackson.version>2.13.2.2</jackson.version>
->>>>>>> 7fa24c320... [close #567] upgrade jackson-databind to 2.13.2.2 to fix CVE-2020-36518 (#584)
         <trove4j.version>3.0.1</trove4j.version>
         <jetcd.version>0.4.1</jetcd.version>
         <joda-time.version>2.9.9</joda-time.version>
@@ -189,7 +184,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.databind.version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>io.etcd</groupId>