From ddcf619deb331ab6d413e3c7c65c44977c65cf18 Mon Sep 17 00:00:00 2001
From: agapple <jianghang.loujh@alibaba-inc.com>
Date: Sun, 28 Oct 2018 23:39:11 +0800
Subject: [PATCH 1/9] Update README.md

---
 client-adapter/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client-adapter/README.md b/client-adapter/README.md
index b3d92c77..0ca50b9b 100644
--- a/client-adapter/README.md
+++ b/client-adapter/README.md
@@ -41,7 +41,7 @@ canal.conf:
   flatMessage: true                 # 扁平message开关, 是否以json字符串形式投递数据, 仅在kafka/rocketMQ模式下有效
   canalInstances:                   # canal实例组, 如果是tcp模式可配置此项
   - instance: example               # 对应canal destination
-    adapterGroups:                  # 对应适配器分组, 分组间的适配器并行运行
+    groups:                  # 对应适配器分组, 分组间的适配器并行运行
     - outAdapters:                  # 适配器列表, 分组内的适配串行运行
       - name: logger                # 适配器SPI名
       - name: hbase

From 56ed158814f07293114b08ce2111bb0bb39d907a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E9=94=8B?= <jianghang.loujh@alibaba-inc.com>
Date: Mon, 29 Oct 2018 12:46:20 +0800
Subject: [PATCH 2/9] fixed issue #850 , support alter lock/algorithm

---
 .../otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java | 2 ++
 pom.xml                                                         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java
index 70eab24c..bf0deafe 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java
@@ -19,6 +19,8 @@ public class FastsqlSchemaTest {
     public void testSimple() throws FileNotFoundException, IOException {
         SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL);
         String sql = "create table yushitai_test.card_record ( id bigint auto_increment, name varchar(32) DEFAULT NULL) auto_increment=256 "
+                     + "ALTER TABLE yushitai_test.card_record ADD COLUMN remark2 varchar(255) DEFAULT NULL , ALGORITHM=inplace,LOCK=NONE;"
+                     + "ALTER TABLE yushitai_test.card_record modify COLUMN name varchar(64) DEFAULT NULL , ALGORITHM=copy,LOCK=SHARED; "
                      + "alter table yushitai_test.card_record add index index_name(name) ;"
                      + "alter table yushitai_test.card_record add index index_name(name) ;"
                      + "alter table yushitai_test.card_record add Constraint pk_id PRIMARY KEY (id);"
diff --git a/pom.xml b/pom.xml
index 27038086..02ff2756 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,7 +246,7 @@
             <dependency>
                 <groupId>com.alibaba.fastsql</groupId>
                 <artifactId>fastsql</artifactId>
-                <version>2.0.0_preview_630</version>
+                <version>2.0.0_preview_644</version>
             </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>

From d03e7e2b1580232a38c753d931d8f5e54fcf32fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E9=94=8B?= <jianghang.loujh@alibaba-inc.com>
Date: Mon, 29 Oct 2018 13:49:24 +0800
Subject: [PATCH 3/9] fixed canal_version release

---
 client-adapter/common/pom.xml   | 2 +-
 client-adapter/launcher/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client-adapter/common/pom.xml b/client-adapter/common/pom.xml
index eb3a21a3..82042053 100644
--- a/client-adapter/common/pom.xml
+++ b/client-adapter/common/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.protocol</artifactId>
-            <version>${canal_version}</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/client-adapter/launcher/pom.xml b/client-adapter/launcher/pom.xml
index 8159bb66..0b7325ad 100644
--- a/client-adapter/launcher/pom.xml
+++ b/client-adapter/launcher/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.client</artifactId>
-            <version>${canal_version}</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>

From f28efce11eae59aa3c3a5d5573a1aea770192db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E9=94=8B?= <jianghang.loujh@alibaba-inc.com>
Date: Mon, 29 Oct 2018 14:54:17 +0800
Subject: [PATCH 4/9] fixed javadoc for release

---
 common/pom.xml                                             | 7 ++++++-
 .../com/alibaba/otter/canal/common/utils/BooleanMutex.java | 2 +-
 pom.xml                                                    | 6 +++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 1f2ece8b..545905c2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
@@ -83,6 +84,10 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
diff --git a/common/src/main/java/com/alibaba/otter/canal/common/utils/BooleanMutex.java b/common/src/main/java/com/alibaba/otter/canal/common/utils/BooleanMutex.java
index d729ad01..660181ce 100644
--- a/common/src/main/java/com/alibaba/otter/canal/common/utils/BooleanMutex.java
+++ b/common/src/main/java/com/alibaba/otter/canal/common/utils/BooleanMutex.java
@@ -5,7 +5,7 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.locks.AbstractQueuedSynchronizer;
 
 /**
- * 实现一个互斥实现，基于Cocurrent中的{@linkplain AbstractQueuedSynchronizer}实现了自己的sync <br/>
+ * 实现一个互斥实现，基于Cocurrent中的AbstractQueuedSynchronizer实现了自己的sync <br/>
  * 应用场景：系统初始化/授权控制，没权限时阻塞等待。有权限时所有线程都可以快速通过
  * 
  * <pre>
diff --git a/pom.xml b/pom.xml
index 02ff2756..edda070d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,7 +297,11 @@
                 <version>5.1.40</version>
                 <!--<scope>test</scope>-->
             </dependency>
-
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>3.0.2</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 774aeeea68a1eae6b9e52d6005e4eb866c891522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E9=94=8B?= <jianghang.loujh@alibaba-inc.com>
Date: Mon, 29 Oct 2018 14:57:25 +0800
Subject: [PATCH 5/9] [maven-release-plugin] prepare release canal-1.1.1

---
 client-adapter/common/pom.xml   |  8 +++-----
 client-adapter/hbase/pom.xml    |  6 ++----
 client-adapter/launcher/pom.xml | 16 +++++++---------
 client-adapter/logger/pom.xml   |  6 ++----
 client-adapter/pom.xml          |  6 ++----
 client/pom.xml                  |  5 ++---
 common/pom.xml                  |  5 ++---
 dbsync/pom.xml                  |  2 +-
 deployer/pom.xml                |  2 +-
 driver/pom.xml                  |  2 +-
 example/pom.xml                 |  2 +-
 filter/pom.xml                  |  2 +-
 instance/core/pom.xml           |  2 +-
 instance/manager/pom.xml        |  2 +-
 instance/pom.xml                |  2 +-
 instance/spring/pom.xml         |  2 +-
 meta/pom.xml                    |  2 +-
 parse/pom.xml                   |  2 +-
 pom.xml                         | 20 +++++++++++++++++++-
 prometheus/pom.xml              |  4 ++--
 protocol/pom.xml                |  2 +-
 server/pom.xml                  |  2 +-
 sink/pom.xml                    |  2 +-
 store/pom.xml                   |  2 +-
 24 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/client-adapter/common/pom.xml b/client-adapter/common/pom.xml
index 82042053..347dae44 100644
--- a/client-adapter/common/pom.xml
+++ b/client-adapter/common/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
@@ -16,7 +14,7 @@
         <dependency>
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.protocol</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/client-adapter/hbase/pom.xml b/client-adapter/hbase/pom.xml
index b3d274e4..94acbbe2 100644
--- a/client-adapter/hbase/pom.xml
+++ b/client-adapter/hbase/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
diff --git a/client-adapter/launcher/pom.xml b/client-adapter/launcher/pom.xml
index 0b7325ad..8cc80d81 100644
--- a/client-adapter/launcher/pom.xml
+++ b/client-adapter/launcher/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
@@ -34,7 +32,7 @@
         <dependency>
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.client</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
@@ -134,14 +132,14 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${project.basedir}/target/config" overwrite="true" >
+                                <copy todir="${project.basedir}/target/config" overwrite="true">
                                     <fileset dir="${project.basedir}/src/main/resources" erroronmissingdir="true">
-                                        <include name="*.yml"/>
+                                        <include name="*.yml" />
                                     </fileset>
                                 </copy>
-                                <copy todir="${project.basedir}/target/config/hbase" overwrite="true" >
+                                <copy todir="${project.basedir}/target/config/hbase" overwrite="true">
                                     <fileset dir="${project.basedir}/../hbase/src/main/resources/hbase" erroronmissingdir="true">
-                                        <include name="*.yml"/>
+                                        <include name="*.yml" />
                                     </fileset>
                                 </copy>
                             </tasks>
diff --git a/client-adapter/logger/pom.xml b/client-adapter/logger/pom.xml
index af7ec379..bfbe39f8 100644
--- a/client-adapter/logger/pom.xml
+++ b/client-adapter/logger/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
diff --git a/client-adapter/pom.xml b/client-adapter/pom.xml
index aafe6395..e5ad637b 100644
--- a/client-adapter/pom.xml
+++ b/client-adapter/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
     <artifactId>canal.client-adapter</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <packaging>pom</packaging>
     <name>canal client adapter module for otter ${project.version}</name>
 
diff --git a/client/pom.xml b/client/pom.xml
index 370d1854..3f7d6ed5 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
@@ -180,8 +180,7 @@
 								</relocation>
 							</relocations>
 							<transformers>
-								<transformer
-										implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
 							</transformers>
 						</configuration>
 					</execution>
diff --git a/common/pom.xml b/common/pom.xml
index 545905c2..0b85b882 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.common</artifactId>
diff --git a/dbsync/pom.xml b/dbsync/pom.xml
index ac606af4..959d9594 100644
--- a/dbsync/pom.xml
+++ b/dbsync/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/deployer/pom.xml b/deployer/pom.xml
index 690b8c91..cc4226a4 100644
--- a/deployer/pom.xml
+++ b/deployer/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/driver/pom.xml b/driver/pom.xml
index 692475db..04c9d3e4 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/example/pom.xml b/example/pom.xml
index 679bfb1d..c125ddda 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/filter/pom.xml b/filter/pom.xml
index 95c77f8f..40a36b51 100644
--- a/filter/pom.xml
+++ b/filter/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/instance/core/pom.xml b/instance/core/pom.xml
index 1a73fc8a..554c9a62 100644
--- a/instance/core/pom.xml
+++ b/instance/core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.instance.core</artifactId>
diff --git a/instance/manager/pom.xml b/instance/manager/pom.xml
index ec85fa2c..3dd0a1d7 100644
--- a/instance/manager/pom.xml
+++ b/instance/manager/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/instance/pom.xml b/instance/pom.xml
index a73b43fe..8723337d 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/instance/spring/pom.xml b/instance/spring/pom.xml
index 929fc273..b885754d 100644
--- a/instance/spring/pom.xml
+++ b/instance/spring/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/meta/pom.xml b/meta/pom.xml
index 98788116..d27e41d2 100644
--- a/meta/pom.xml
+++ b/meta/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/parse/pom.xml b/parse/pom.xml
index 8e47215b..8e90cb88 100644
--- a/parse/pom.xml
+++ b/parse/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.parse</artifactId>
diff --git a/pom.xml b/pom.xml
index edda070d..88a9b62d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>canal</artifactId>
     <packaging>pom</packaging>
     <name>canal module for otter ${project.version}</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <url>https://github.com/alibaba/canal</url>
     <parent>
         <groupId>org.sonatype.oss</groupId>
@@ -371,6 +371,24 @@
                 </configuration>
             </plugin>
             <!-- javadoc -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <executions>
+                    <execution>
+                            <id>attach-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                <configuration>
+                  <encoding>${file_encoding}</encoding>
+                  <charset>${file_encoding}</charset>
+                  <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+            </plugin>
             <!--
             <plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/prometheus/pom.xml b/prometheus/pom.xml
index 29bf8c1f..7b10336f 100644
--- a/prometheus/pom.xml
+++ b/prometheus/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>canal</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.alibaba.otter</groupId>
     <artifactId>canal.prometheus</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1</version>
     <name>canal prometheus module for otter ${project.version}</name>
     <dependencies>
         <dependency>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index f8211e56..48d657d2 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index 20108523..e011982f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.server</artifactId>
diff --git a/sink/pom.xml b/sink/pom.xml
index 1a1fef1e..3b0b74d6 100644
--- a/sink/pom.xml
+++ b/sink/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/store/pom.xml b/store/pom.xml
index 2fb122d0..7003c225 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>

From b9f40f326fba47d070932741a37d2393da4f5fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E9=94=8B?= <jianghang.loujh@alibaba-inc.com>
Date: Mon, 29 Oct 2018 14:57:39 +0800
Subject: [PATCH 6/9] [maven-release-plugin] prepare for next development
 iteration

---
 client-adapter/common/pom.xml   | 4 ++--
 client-adapter/hbase/pom.xml    | 2 +-
 client-adapter/launcher/pom.xml | 4 ++--
 client-adapter/logger/pom.xml   | 2 +-
 client-adapter/pom.xml          | 2 +-
 client/pom.xml                  | 2 +-
 common/pom.xml                  | 2 +-
 dbsync/pom.xml                  | 2 +-
 deployer/pom.xml                | 2 +-
 driver/pom.xml                  | 2 +-
 example/pom.xml                 | 2 +-
 filter/pom.xml                  | 2 +-
 instance/core/pom.xml           | 2 +-
 instance/manager/pom.xml        | 2 +-
 instance/pom.xml                | 2 +-
 instance/spring/pom.xml         | 2 +-
 meta/pom.xml                    | 2 +-
 parse/pom.xml                   | 2 +-
 pom.xml                         | 2 +-
 prometheus/pom.xml              | 4 ++--
 protocol/pom.xml                | 2 +-
 server/pom.xml                  | 2 +-
 sink/pom.xml                    | 2 +-
 store/pom.xml                   | 2 +-
 24 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/client-adapter/common/pom.xml b/client-adapter/common/pom.xml
index 347dae44..e62fc386 100644
--- a/client-adapter/common/pom.xml
+++ b/client-adapter/common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.protocol</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
diff --git a/client-adapter/hbase/pom.xml b/client-adapter/hbase/pom.xml
index 94acbbe2..623d919b 100644
--- a/client-adapter/hbase/pom.xml
+++ b/client-adapter/hbase/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
diff --git a/client-adapter/launcher/pom.xml b/client-adapter/launcher/pom.xml
index 8cc80d81..1a79ed21 100644
--- a/client-adapter/launcher/pom.xml
+++ b/client-adapter/launcher/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.alibaba.otter</groupId>
             <artifactId>canal.client</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
diff --git a/client-adapter/logger/pom.xml b/client-adapter/logger/pom.xml
index bfbe39f8..bca319f1 100644
--- a/client-adapter/logger/pom.xml
+++ b/client-adapter/logger/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
diff --git a/client-adapter/pom.xml b/client-adapter/pom.xml
index e5ad637b..e2be0d35 100644
--- a/client-adapter/pom.xml
+++ b/client-adapter/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
     <artifactId>canal.client-adapter</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>canal client adapter module for otter ${project.version}</name>
 
diff --git a/client/pom.xml b/client/pom.xml
index 3f7d6ed5..c12447c9 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index 0b85b882..9a3c3b22 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.common</artifactId>
diff --git a/dbsync/pom.xml b/dbsync/pom.xml
index 959d9594..9aa0fa68 100644
--- a/dbsync/pom.xml
+++ b/dbsync/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/deployer/pom.xml b/deployer/pom.xml
index cc4226a4..25d0c6e3 100644
--- a/deployer/pom.xml
+++ b/deployer/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/driver/pom.xml b/driver/pom.xml
index 04c9d3e4..b7db03fe 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/example/pom.xml b/example/pom.xml
index c125ddda..ae040df6 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/filter/pom.xml b/filter/pom.xml
index 40a36b51..e9a2f60c 100644
--- a/filter/pom.xml
+++ b/filter/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/instance/core/pom.xml b/instance/core/pom.xml
index 554c9a62..c96d8ce5 100644
--- a/instance/core/pom.xml
+++ b/instance/core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.instance.core</artifactId>
diff --git a/instance/manager/pom.xml b/instance/manager/pom.xml
index 3dd0a1d7..0710dbd1 100644
--- a/instance/manager/pom.xml
+++ b/instance/manager/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/instance/pom.xml b/instance/pom.xml
index 8723337d..3ccf7ebd 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/instance/spring/pom.xml b/instance/spring/pom.xml
index b885754d..3d5526d4 100644
--- a/instance/spring/pom.xml
+++ b/instance/spring/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/meta/pom.xml b/meta/pom.xml
index d27e41d2..8683e8e7 100644
--- a/meta/pom.xml
+++ b/meta/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/parse/pom.xml b/parse/pom.xml
index 8e90cb88..d610838d 100644
--- a/parse/pom.xml
+++ b/parse/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.parse</artifactId>
diff --git a/pom.xml b/pom.xml
index 88a9b62d..5cb51eac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>canal</artifactId>
     <packaging>pom</packaging>
     <name>canal module for otter ${project.version}</name>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
     <url>https://github.com/alibaba/canal</url>
     <parent>
         <groupId>org.sonatype.oss</groupId>
diff --git a/prometheus/pom.xml b/prometheus/pom.xml
index 7b10336f..0e0b2217 100644
--- a/prometheus/pom.xml
+++ b/prometheus/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>canal</artifactId>
         <groupId>com.alibaba.otter</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.alibaba.otter</groupId>
     <artifactId>canal.prometheus</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
     <name>canal prometheus module for otter ${project.version}</name>
     <dependencies>
         <dependency>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 48d657d2..f1cdfa2f 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index e011982f..cc4b63d0 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.server</artifactId>
diff --git a/sink/pom.xml b/sink/pom.xml
index 3b0b74d6..e4f9674d 100644
--- a/sink/pom.xml
+++ b/sink/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
diff --git a/store/pom.xml b/store/pom.xml
index 7003c225..531b39a4 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>

From d134aa0c20356a9c60782b74d4ecfe2d39f3e01b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E9=94=8B?= <jianghang.loujh@alibaba-inc.com>
Date: Mon, 29 Oct 2018 15:59:32 +0800
Subject: [PATCH 7/9] fixed adjust default value

---
 deployer/src/main/resources/example/instance.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployer/src/main/resources/example/instance.properties b/deployer/src/main/resources/example/instance.properties
index 25bab241..0caef6d2 100644
--- a/deployer/src/main/resources/example/instance.properties
+++ b/deployer/src/main/resources/example/instance.properties
@@ -31,12 +31,12 @@ canal.instance.tsdb.enable=true
 
 # username/password
 canal.instance.dbUsername=canal
-canal.instance.dbPassword=cZozNf1mzW6EQLGO2q9u99619xbZLO0fbua3EX08r4BWNXb8lAt1aHrTEOBttd6UY8Vnuc0easlVXZDdLtt8BQ==
-canal.instance.pwdPublicKey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALK4BUxdDltRRE5/zXpVEVPUgunvscYFtEip3pmLlhrWpacX7y7GCMo2/JM6LeHmiiNdH1FWgGCpUfircSwlWKUCAwEAAQ==
+canal.instance.dbPassword=canal
 canal.instance.connectionCharset = UTF-8
 canal.instance.defaultDatabaseName =test
 # enable druid Decrypt database password
-canal.instance.enableDruid=true
+canal.instance.enableDruid=false
+#canal.instance.pwdPublicKey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALK4BUxdDltRRE5/zXpVEVPUgunvscYFtEip3pmLlhrWpacX7y7GCMo2/JM6LeHmiiNdH1FWgGCpUfircSwlWKUCAwEAAQ==
 
 # table regex
 canal.instance.filter.regex=.*\\..*

From fa79db65b73655b98307836fea1922885cea87d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=B3=B0?= <zhao.feng5@geely.com>
Date: Mon, 29 Oct 2018 16:18:12 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20fix=20NPE,=20=E4=BD=BF=E7=94=A8Canal?=
 =?UTF-8?q?ServerWithManager=E6=97=B6=EF=BC=8C=E5=BC=80=E5=90=AFGTID?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E4=B8=8D=E4=BC=A0=E5=85=A5?=
 =?UTF-8?q?masterPosition=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=9A=E4=BA=A7=E7=94=9FNPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otter/canal/parse/inbound/mysql/MysqlEventParser.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
index 7f83b6d2..df9c952c 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParser.java
@@ -35,12 +35,12 @@ import com.taobao.tddl.dbsync.binlog.LogEvent;
 
 /**
  * 基于向mysql server复制binlog实现
- * 
+ *
  * <pre>
  * 1. 自身不控制mysql主备切换，由ha机制来控制. 比如接入tddl/cobar/自身心跳包成功率
  * 2. 切换机制
  * </pre>
- * 
+ *
  * @author jianghang 2012-6-21 下午04:06:32
  * @version 1.0.0
  */
@@ -202,7 +202,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
 
     /**
      * 心跳信息
-     * 
+     *
      * @author jianghang 2012-7-6 下午02:50:15
      * @version 1.0.0
      */
@@ -352,7 +352,7 @@ public class MysqlEventParser extends AbstractMysqlEventParser implements CanalE
                 return logPosition.getPostion();
             }
 
-            if (StringUtils.isNotEmpty(masterPosition.getGtid())) {
+            if (masterPosition!=null && StringUtils.isNotEmpty(masterPosition.getGtid())) {
                 return masterPosition;
             }
         }

From be5f1546ca31ebba70acaf6f550ead3214ce1fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=83=E9=94=8B?= <jianghang.loujh@alibaba-inc.com>
Date: Mon, 29 Oct 2018 16:56:29 +0800
Subject: [PATCH 9/9] fixed issue #1063 , rocketmq bugfix

---
 .../alibaba/otter/canal/rocketmq/CanalRocketMQProducer.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/alibaba/otter/canal/rocketmq/CanalRocketMQProducer.java b/server/src/main/java/com/alibaba/otter/canal/rocketmq/CanalRocketMQProducer.java
index 0c699d7f..aaace132 100644
--- a/server/src/main/java/com/alibaba/otter/canal/rocketmq/CanalRocketMQProducer.java
+++ b/server/src/main/java/com/alibaba/otter/canal/rocketmq/CanalRocketMQProducer.java
@@ -63,7 +63,6 @@ public class CanalRocketMQProducer implements CanalMQProducer {
                         return mqs.get(partition);
                     }
                 }, null);
-                callback.commit();
             } catch (MQClientException | RemotingException | MQBrokerException | InterruptedException e) {
                 logger.error("Send message error!", e);
                 callback.rollback();
@@ -122,7 +121,6 @@ public class CanalRocketMQProducer implements CanalMQProducer {
                                     logger.error("send flat message to hashed partition error", e);
                                     callback.rollback();
                                 }
-
                             }
                         }
                     }
@@ -130,6 +128,10 @@ public class CanalRocketMQProducer implements CanalMQProducer {
             }
         }
 
+        callback.commit();
+        if (logger.isDebugEnabled()) {
+            logger.debug("send message to rocket topic: {}", destination.getTopic());
+        }
     }
 
     @Override