Merge pull request #6 from buession/development

Release 2.0.0
buession · Nov 7, 2024 · 9a58400 · 9a58400
2 parents e1dcd40 + b9ff732
commit 9a58400
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 79 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,16 @@
 ===========================
 
 
-## [1.0.0](https://github.com/buession/buession-canal/releases/tag/v1.0.0) (2024-05-06)
+## [2.0.0](https://github.com/buession/buession-canal/releases/tag/v2.0.0) (2024-11-07)
 
 ### 🔨依赖升级
 
-- [依赖库版本升级和安全漏洞修复](https://github.com/buession/buession-parent/releases/tag/v2.3.3)
+- [依赖库版本升级和安全漏洞修复](https://github.com/buession/buession-parent/releases/tag/v3.0.0)
 
 
 ### ⭐ 新特性
 
-- **buession-canal-springboot：** 增加 canal 的 spring boot 支持
+- 增加 spring boot 支持
 
 
 ---

diff --git a/buession-canal-annotation/pom.xml b/buession-canal-annotation/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.canal</groupId>
 		<artifactId>buession-canal-parent</artifactId>
 		<relativePath>../buession-canal-parent</relativePath>
-		<version>1.0.0</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>buession-canal-annotation</artifactId>
 	<url>https://canal.buession.com/</url>
@@ -62,16 +62,16 @@
 					<artifactId>canal.common</artifactId>
 				</exclusion>
 				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>*</artifactId>
+					<groupId>commons-lang</groupId>
+					<artifactId>commons-lang</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.protobuf</groupId>
+					<artifactId>protobuf-java</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -123,8 +123,8 @@
 				<artifactId>maven-gpg-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/buession-canal-client/pom.xml b/buession-canal-client/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.canal</groupId>
 		<artifactId>buession-canal-parent</artifactId>
 		<relativePath>../buession-canal-parent</relativePath>
-		<version>1.0.0</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>buession-canal-client</artifactId>
 	<url>https://canal.buession.com/</url>
@@ -58,45 +58,23 @@
 			<version>${project.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.buession</groupId>
-			<artifactId>buession-core</artifactId>
-			<version>${buession.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.alibaba.otter</groupId>
-			<artifactId>canal.protocol</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.alibaba.otter</groupId>
 			<artifactId>canal.client</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.zookeeper</groupId>
-			<artifactId>zookeeper</artifactId>
-			<scope>provided</scope>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka-clients</artifactId>
-		</dependency>
-
 		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -105,8 +83,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
 		</dependency>
 	</dependencies>
 
@@ -150,8 +128,8 @@
 				<artifactId>maven-gpg-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/...-canal-client/src/test/java/com/buession/canal/client/adapter/KafkaAdapterClientTest.java b/...-canal-client/src/test/java/com/buession/canal/client/adapter/KafkaAdapterClientTest.java
@@ -25,7 +25,7 @@
 package com.buession.canal.client.adapter;
 
 import com.buession.canal.core.Result;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/...on-canal-client/src/test/java/com/buession/canal/client/adapter/TcpAdapterClientTest.java b/...on-canal-client/src/test/java/com/buession/canal/client/adapter/TcpAdapterClientTest.java
@@ -26,7 +26,7 @@
 
 import com.buession.canal.core.CanalMessage;
 import com.buession.canal.core.Result;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;

diff --git a/buession-canal-core/pom.xml b/buession-canal-core/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.canal</groupId>
 		<artifactId>buession-canal-parent</artifactId>
 		<relativePath>../buession-canal-parent</relativePath>
-		<version>1.0.0</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>buession-canal-core</artifactId>
 	<url>https://canal.buession.com/</url>
@@ -76,19 +76,22 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.alibaba.otter</groupId>
 			<artifactId>canal.protocol</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>com.alibaba.fastjson2</groupId>
+			<artifactId>fastjson2</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
@@ -98,12 +101,6 @@
 			<artifactId>commons-io</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.zookeeper</groupId>
-			<artifactId>zookeeper</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -160,8 +157,8 @@
 				<artifactId>maven-gpg-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/buession-canal-parent/pom.xml b/buession-canal-parent/pom.xml
@@ -7,13 +7,13 @@
 		<groupId>com.buession</groupId>
 		<artifactId>parent</artifactId>
 		<relativePath/>
-		<version>2.3.3</version>
+		<version>3.0.0</version>
 	</parent>
 	<groupId>com.buession.canal</groupId>
 	<artifactId>buession-canal-parent</artifactId>
 	<url>https://canal.buession.com/</url>
 	<description>Buession Canal Framework Parent</description>
-	<version>1.0.0</version>
+	<version>2.0.0</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -62,8 +62,8 @@
 	</modules>
 
 	<properties>
-		<buession.version>2.3.3</buession.version>
-		<buession.springboot.version>2.3.3</buession.springboot.version>
+		<buession.version>3.0.0</buession.version>
+		<buession.springboot.version>3.0.0</buession.springboot.version>
 		<alibaba.canal.version>1.1.7</alibaba.canal.version>
 	</properties>
 
@@ -79,6 +79,14 @@
 						<groupId>io.netty</groupId>
 						<artifactId>*</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>org.apache.zookeeper</groupId>
+						<artifactId>*</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.101tec</groupId>
+						<artifactId>zkclient</artifactId>
+					</exclusion>
 					<exclusion>
 						<groupId>org.slf4j</groupId>
 						<artifactId>*</artifactId>
@@ -98,6 +106,14 @@
 						<groupId>io.netty</groupId>
 						<artifactId>*</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>org.apache.zookeeper</groupId>
+						<artifactId>*</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.101tec</groupId>
+						<artifactId>zkclient</artifactId>
+					</exclusion>
 					<exclusion>
 						<groupId>org.slf4j</groupId>
 						<artifactId>*</artifactId>
@@ -128,20 +144,9 @@
 				<artifactId>maven-gpg-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>
-
-	<distributionManagement>
-		<snapshotRepository>
-			<id>sonatype-nexus-snapshots</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-		<repository>
-			<id>sonatype-nexus-staging</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
 </project>
diff --git a/buession-canal-spring/pom.xml b/buession-canal-spring/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.canal</groupId>
 		<artifactId>buession-canal-parent</artifactId>
 		<relativePath>../buession-canal-parent</relativePath>
-		<version>1.0.0</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>buession-canal-spring</artifactId>
 	<url>https://canal.buession.com/</url>
@@ -117,8 +117,8 @@
 				<artifactId>maven-gpg-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/buession-canal-springboot/pom.xml b/buession-canal-springboot/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.buession.canal</groupId>
 		<artifactId>buession-canal-parent</artifactId>
 		<relativePath>../buession-canal-parent</relativePath>
-		<version>1.0.0</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>buession-canal-springboot</artifactId>
 	<url>https://canal.buession.com/</url>
@@ -115,8 +115,8 @@
 				<artifactId>maven-gpg-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>