From c15abbccf6f5154ee3d1215d465ff3b9a860e346 Mon Sep 17 00:00:00 2001 From: "yong.teng" Date: Fri, 7 Jun 2024 16:11:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Upgrade=20buessionframework=E3=80=81buessio?= =?UTF-8?q?n=20springboot=20to=203.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- buession-canal-parent/pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70264bd..c422084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ ### 🔨依赖升级 -- [依赖库版本升级和安全漏洞修复](https://github.com/buession/buession-parent/releases/tag/v2.3.3) +- [依赖库版本升级和安全漏洞修复](https://github.com/buession/buession-parent/releases/tag/v3.0.0) ### ⭐ 新特性 diff --git a/buession-canal-parent/pom.xml b/buession-canal-parent/pom.xml index 23b5580..656ef19 100644 --- a/buession-canal-parent/pom.xml +++ b/buession-canal-parent/pom.xml @@ -7,7 +7,7 @@ com.buession parent - 2.3.3 + 3.0.0 com.buession.canal buession-canal-parent @@ -62,8 +62,8 @@ - 2.3.3 - 2.3.3 + 3.0.0 + 3.0.0 1.1.7 From 4fbdf01e1c2dc16a608a7d0631b3e59888dd54a2 Mon Sep 17 00:00:00 2001 From: "yong.teng" Date: Wed, 7 Aug 2024 21:00:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- buession-canal-annotation/pom.xml | 12 +++---- buession-canal-client/pom.xml | 34 ++++--------------- .../adapter/KafkaAdapterClientTest.java | 2 +- .../client/adapter/TcpAdapterClientTest.java | 2 +- buession-canal-core/pom.xml | 13 +++---- buession-canal-parent/pom.xml | 16 +++++++++ 7 files changed, 36 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c422084..552efac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ ### ⭐ 新特性 -- **buession-canal-springboot：** 增加 canal 的 spring boot 支持 +- 增加 spring boot 支持 --- diff --git a/buession-canal-annotation/pom.xml b/buession-canal-annotation/pom.xml index 299a213..ec1216d 100644 --- a/buession-canal-annotation/pom.xml +++ b/buession-canal-annotation/pom.xml @@ -62,16 +62,16 @@ canal.common - io.netty - * + commons-lang + commons-lang + + + com.google.protobuf + protobuf-java - - org.springframework - spring-core - org.springframework spring-context diff --git a/buession-canal-client/pom.xml b/buession-canal-client/pom.xml index c0815fa..72f1e49 100644 --- a/buession-canal-client/pom.xml +++ b/buession-canal-client/pom.xml @@ -58,45 +58,23 @@ ${project.version} - - com.buession - buession-core - ${buession.version} - - - - com.alibaba.otter - canal.protocol - com.alibaba.otter canal.client - org.apache.zookeeper - zookeeper - provided + org.springframework + spring-aop - - - org.apache.kafka - kafka-clients - - - com.alibaba - fastjson + org.springframework + spring-context - - com.google.guava - guava - com.google.protobuf protobuf-java - provided @@ -105,8 +83,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api diff --git a/buession-canal-client/src/test/java/com/buession/canal/client/adapter/KafkaAdapterClientTest.java b/buession-canal-client/src/test/java/com/buession/canal/client/adapter/KafkaAdapterClientTest.java index 70140b3..966aa2f 100644 --- a/buession-canal-client/src/test/java/com/buession/canal/client/adapter/KafkaAdapterClientTest.java +++ b/buession-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/buession-canal-client/src/test/java/com/buession/canal/client/adapter/TcpAdapterClientTest.java b/buession-canal-client/src/test/java/com/buession/canal/client/adapter/TcpAdapterClientTest.java index 3f44a6c..ccd35f0 100644 --- a/buession-canal-client/src/test/java/com/buession/canal/client/adapter/TcpAdapterClientTest.java +++ b/buession-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 index d908509..e3bb45b 100644 --- a/buession-canal-core/pom.xml +++ b/buession-canal-core/pom.xml @@ -76,12 +76,10 @@ org.springframework spring-jdbc - provided org.springframework spring-orm - provided @@ -89,6 +87,11 @@ canal.protocol + + com.alibaba.fastjson2 + fastjson2 + + commons-codec commons-codec @@ -98,12 +101,6 @@ commons-io - - org.apache.zookeeper - zookeeper - provided - - com.google.guava guava diff --git a/buession-canal-parent/pom.xml b/buession-canal-parent/pom.xml index 656ef19..7767045 100644 --- a/buession-canal-parent/pom.xml +++ b/buession-canal-parent/pom.xml @@ -79,6 +79,14 @@ io.netty * + + org.apache.zookeeper + * + + + com.101tec + zkclient + org.slf4j * @@ -98,6 +106,14 @@ io.netty * + + org.apache.zookeeper + * + + + com.101tec + zkclient + org.slf4j * From 15f407e56b2af7f284ad1977aec519b85b6f6a24 Mon Sep 17 00:00:00 2001 From: "yong.teng" Date: Thu, 7 Nov 2024 09:36:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buession-canal-annotation/pom.xml | 4 ++-- buession-canal-client/pom.xml | 4 ++-- buession-canal-core/pom.xml | 4 ++-- buession-canal-parent/pom.xml | 15 ++------------- buession-canal-spring/pom.xml | 4 ++-- buession-canal-springboot/pom.xml | 4 ++-- 6 files changed, 12 insertions(+), 23 deletions(-) diff --git a/buession-canal-annotation/pom.xml b/buession-canal-annotation/pom.xml index ec1216d..70e80da 100644 --- a/buession-canal-annotation/pom.xml +++ b/buession-canal-annotation/pom.xml @@ -123,8 +123,8 @@ maven-gpg-plugin - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin diff --git a/buession-canal-client/pom.xml b/buession-canal-client/pom.xml index 72f1e49..8fd37f4 100644 --- a/buession-canal-client/pom.xml +++ b/buession-canal-client/pom.xml @@ -128,8 +128,8 @@ maven-gpg-plugin - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin diff --git a/buession-canal-core/pom.xml b/buession-canal-core/pom.xml index e3bb45b..ad026b3 100644 --- a/buession-canal-core/pom.xml +++ b/buession-canal-core/pom.xml @@ -157,8 +157,8 @@ maven-gpg-plugin - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin diff --git a/buession-canal-parent/pom.xml b/buession-canal-parent/pom.xml index 7767045..023465d 100644 --- a/buession-canal-parent/pom.xml +++ b/buession-canal-parent/pom.xml @@ -144,20 +144,9 @@ maven-gpg-plugin - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin - - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - \ No newline at end of file diff --git a/buession-canal-spring/pom.xml b/buession-canal-spring/pom.xml index 56173ca..ac5ec26 100644 --- a/buession-canal-spring/pom.xml +++ b/buession-canal-spring/pom.xml @@ -117,8 +117,8 @@ maven-gpg-plugin - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin diff --git a/buession-canal-springboot/pom.xml b/buession-canal-springboot/pom.xml index b74d015..62eacc9 100644 --- a/buession-canal-springboot/pom.xml +++ b/buession-canal-springboot/pom.xml @@ -115,8 +115,8 @@ maven-gpg-plugin - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin From b9ff732e1053cee59fa13c3a6d9e1836c3a1249e Mon Sep 17 00:00:00 2001 From: "yong.teng" Date: Thu, 7 Nov 2024 09:44:15 +0800 Subject: [PATCH 4/4] Upgrade 2.0.0 --- CHANGELOG.md | 2 +- buession-canal-annotation/pom.xml | 2 +- buession-canal-client/pom.xml | 2 +- buession-canal-core/pom.xml | 2 +- buession-canal-parent/pom.xml | 2 +- buession-canal-spring/pom.xml | 2 +- buession-canal-springboot/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 552efac..840fbc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ =========================== -## [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) ### 🔨依赖升级 diff --git a/buession-canal-annotation/pom.xml b/buession-canal-annotation/pom.xml index 70e80da..79884d5 100644 --- a/buession-canal-annotation/pom.xml +++ b/buession-canal-annotation/pom.xml @@ -7,7 +7,7 @@ com.buession.canal buession-canal-parent ../buession-canal-parent - 1.0.0 + 2.0.0 buession-canal-annotation https://canal.buession.com/ diff --git a/buession-canal-client/pom.xml b/buession-canal-client/pom.xml index 8fd37f4..92c7675 100644 --- a/buession-canal-client/pom.xml +++ b/buession-canal-client/pom.xml @@ -7,7 +7,7 @@ com.buession.canal buession-canal-parent ../buession-canal-parent - 1.0.0 + 2.0.0 buession-canal-client https://canal.buession.com/ diff --git a/buession-canal-core/pom.xml b/buession-canal-core/pom.xml index ad026b3..0d36f0b 100644 --- a/buession-canal-core/pom.xml +++ b/buession-canal-core/pom.xml @@ -7,7 +7,7 @@ com.buession.canal buession-canal-parent ../buession-canal-parent - 1.0.0 + 2.0.0 buession-canal-core https://canal.buession.com/ diff --git a/buession-canal-parent/pom.xml b/buession-canal-parent/pom.xml index 023465d..9894710 100644 --- a/buession-canal-parent/pom.xml +++ b/buession-canal-parent/pom.xml @@ -13,7 +13,7 @@ buession-canal-parent https://canal.buession.com/ Buession Canal Framework Parent - 1.0.0 + 2.0.0 pom diff --git a/buession-canal-spring/pom.xml b/buession-canal-spring/pom.xml index ac5ec26..d2b1308 100644 --- a/buession-canal-spring/pom.xml +++ b/buession-canal-spring/pom.xml @@ -7,7 +7,7 @@ com.buession.canal buession-canal-parent ../buession-canal-parent - 1.0.0 + 2.0.0 buession-canal-spring https://canal.buession.com/ diff --git a/buession-canal-springboot/pom.xml b/buession-canal-springboot/pom.xml index 62eacc9..e63b886 100644 --- a/buession-canal-springboot/pom.xml +++ b/buession-canal-springboot/pom.xml @@ -7,7 +7,7 @@ com.buession.canal buession-canal-parent ../buession-canal-parent - 1.0.0 + 2.0.0 buession-canal-springboot https://canal.buession.com/