From d7414258959608f39316461c008df9e9d720df5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E5=93=A5?= <winger2049@gmail.com>
Date: Fri, 20 Nov 2020 13:47:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7guava=20=E8=87=B3=2022.0=20(#?=
 =?UTF-8?q?3184)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix issue:#561 增加一个外部参数控制，允许位点不存在时自动重置到当前位点

* Add MariaDB GTID support

* remove client pom bad ns

* upgrade guava version to 22.0
---
 client/pom.xml | 2 +-
 pom.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 9bfbd404..ce65011d 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" ">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
diff --git a/pom.xml b/pom.xml
index 3805c8d3..a12cb78c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,7 +225,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>18.0</version>
+                <version>22.0</version>
             </dependency>
             <dependency>
                 <groupId>com.googlecode.aviator</groupId>