瀏覽代碼

Merge pull request #529 from yakirChen/master

TimelineTransactionBarrier import CanalSinkException; Maven Compile 的一些 Warning
agapple 7 年之前
父節點
當前提交
0af789b1c7

+ 1 - 1
client/pom.xml

@@ -69,7 +69,7 @@
 							<links>
 							<links>
 								<link>https://github.com/alibaba/canal</link>
 								<link>https://github.com/alibaba/canal</link>
 							</links>
 							</links>
-							<outputDirectory>${project.build.directory}/apidocs/apidocs/${pom.version}</outputDirectory>
+							<outputDirectory>${project.build.directory}/apidocs/apidocs/${project.version}</outputDirectory>
 						</configuration>
 						</configuration>
 					</plugin>
 					</plugin>
 					<plugin>
 					<plugin>

+ 8 - 0
pom.xml

@@ -445,6 +445,14 @@
                 </excludes>
                 </excludes>
             </testResource>
             </testResource>
         </testResources>
         </testResources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.0.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
     </build>
 
 
     <distributionManagement>
     <distributionManagement>

+ 1 - 0
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 java.util.concurrent.atomic.AtomicInteger;
 
 
 import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;
 import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;
+import com.alibaba.otter.canal.sink.exception.CanalSinkException;
 import com.alibaba.otter.canal.store.model.Event;
 import com.alibaba.otter.canal.store.model.Event;
 
 
 /**
 /**