From 514876f60fabc6c24a3119a9ec602cc98f2c6ed6 Mon Sep 17 00:00:00 2001
From: yakirChen <iamyakirchen@outlook.com>
Date: Mon, 12 Feb 2018 11:17:54 +0800
Subject: [PATCH] =?UTF-8?q?[x]=20Fix=20Compile=20Error=20:=20TimelineTrans?=
 =?UTF-8?q?actionBarrier.java:[70,27]=20=E6=89=BE=E4=B8=8D=E5=88=B0?=
 =?UTF-8?q?=E7=AC=A6=E5=8F=B7:=20=20=20=E7=B1=BB=20CanalSinkException=20[x?=
 =?UTF-8?q?]=20Fix=20Maven=20Wranning:=20The=20expression=20${pom.version}?=
 =?UTF-8?q?=20is=20deprecated.=20Please=20use=20${project.version}=20inste?=
 =?UTF-8?q?ad.=20[x]=20Fix=20MavenWranning=20:=20'build.plugins.plugin.ver?=
 =?UTF-8?q?sion'=20for=20org.apache.maven.plugins:maven-jar-plugin=20is=20?=
 =?UTF-8?q?missing.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/pom.xml                                            | 2 +-
 pom.xml                                                   | 8 ++++++++
 .../sink/entry/group/TimelineTransactionBarrier.java      | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/pom.xml b/client/pom.xml
index 2778841c..c736b141 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -69,7 +69,7 @@
 							<links>
 								<link>https://github.com/alibaba/canal</link>
 							</links>
-							<outputDirectory>${project.build.directory}/apidocs/apidocs/${pom.version}</outputDirectory>
+							<outputDirectory>${project.build.directory}/apidocs/apidocs/${project.version}</outputDirectory>
 						</configuration>
 					</plugin>
 					<plugin>
diff --git a/pom.xml b/pom.xml
index e28e2806..7cb94cfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -445,6 +445,14 @@
                 </excludes>
             </testResource>
         </testResources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.0.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <distributionManagement>
diff --git a/sink/src/main/java/com/alibaba/otter/canal/sink/entry/group/TimelineTransactionBarrier.java b/sink/src/main/java/com/alibaba/otter/canal/sink/entry/group/TimelineTransactionBarrier.java
index 22a734a0..5f6c42b3 100644
--- a/sink/src/main/java/com/alibaba/otter/canal/sink/entry/group/TimelineTransactionBarrier.java
+++ b/sink/src/main/java/com/alibaba/otter/canal/sink/entry/group/TimelineTransactionBarrier.java
@@ -5,6 +5,7 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;
+import com.alibaba.otter.canal.sink.exception.CanalSinkException;
 import com.alibaba.otter.canal.store.model.Event;
 
 /**