From 96af22be577ae7f20e4ff33717bc799d7b6595c3 Mon Sep 17 00:00:00 2001
From: "tiger.yan" <yanhuqing666@gmail.com>
Date: Thu, 18 Jun 2020 14:25:17 +0800
Subject: [PATCH] 1.CVE-2018-10237 2.typo (#1892)

---
 pom.xml                                       | 32 ++++++++++++++-----
 .../backend/heartbeat/MySQLHeartbeat.java     |  2 +-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 970de82ad..69f775c9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,11 +48,6 @@
             <name>Maven Repository Switchboard</name>
             <url>https://repo1.maven.org/maven2/</url>
         </pluginRepository>
-        <pluginRepository>
-            <id>repo2</id>
-            <name>Human Readable Name for this Mirror.</name>
-            <url>https://repo2.maven.org/maven2/</url>
-        </pluginRepository>
         <pluginRepository>
             <id>jenkins</id>
             <name>Jenkins Releases Repository</name>
@@ -74,7 +69,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>19.0</version>
+            <version>24.1.1-jre</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -206,12 +201,24 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
-            <version>2.11.0</version>
+            <version>4.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
-            <version>2.11.0</version>
+            <version>4.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
@@ -223,8 +230,17 @@
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.zookeeper</groupId>
+                    <artifactId>zookeeper</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>3.4.6</version>
+        </dependency>
         <!-- joda time execute time -->
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/src/main/java/com/actiontech/dble/backend/heartbeat/MySQLHeartbeat.java b/src/main/java/com/actiontech/dble/backend/heartbeat/MySQLHeartbeat.java
index 7cba2568c..6b15b6180 100644
--- a/src/main/java/com/actiontech/dble/backend/heartbeat/MySQLHeartbeat.java
+++ b/src/main/java/com/actiontech/dble/backend/heartbeat/MySQLHeartbeat.java
@@ -239,7 +239,7 @@ public class MySQLHeartbeat {
             long timeDiff = System.currentTimeMillis() - this.startErrorTime.longValue();
             if (timeDiff >= heartbeatTimeout) {
                 if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("error heartbaet continued for more than " + timeDiff + " Milliseconds and heartbeat Timeout is " + heartbeatTimeout + " Milliseconds");
+                    LOGGER.debug("error heartbeat continued for more than " + timeDiff + " Milliseconds and heartbeat Timeout is " + heartbeatTimeout + " Milliseconds");
                 }
                 return false;
             }