chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade spring cloud & spring boot version

Browse Source
This commit is contained in:
jianghang.loujh
2023-09-01 19:51:49 +08:00
parent 69cfbabb10
commit d90066e01b
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/pom.xml
View File

@@ -31,12 +31,12 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId> <artifactId>spring-cloud-context</artifactId>
<version>2.0.0.RELEASE</version> <version>3.0.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
<version>2.0.1.RELEASE</version> <version>2.5.4</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

2
client-adapter/launcher/pom.xml
View File

@@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
<version>2.0.1.RELEASE</version> <version>2.5.4</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

3
client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/CanalAdapterApplication.java
View File

@@ -3,6 +3,7 @@ package com.alibaba.otter.canal.adapter.launcher;
import org.springframework.boot.Banner; import org.springframework.boot.Banner;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
/** /**
* 启动入口 * 启动入口
@@ -10,7 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* @author rewerma @ 2018-10-20 * @author rewerma @ 2018-10-20
* @version 1.0.0 * @version 1.0.0
*/ */
@SpringBootApplication @SpringBootApplication(exclude= { DataSourceAutoConfiguration.class})
public class CanalAdapterApplication { public class CanalAdapterApplication {
public static void main(String[] args) { public static void main(String[] args) {
// 支持rocketmq client 配置日志路径 // 支持rocketmq client 配置日志路径

4
client-adapter/pom.xml
View File

@@ -110,12 +110,12 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId> <artifactId>spring-cloud-context</artifactId>
<version>2.0.0.RELEASE</version> <version>3.0.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId> <artifactId>spring-boot</artifactId>
<version>2.0.1.RELEASE</version> <version>2.5.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>

1
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlMultiStageCoprocessor.java
View File

@@ -426,6 +426,7 @@ public class MysqlMultiStageCoprocessor extends AbstractCanalLifeCycle implement
event.setEntry(null); event.setEntry(null);
// clear compress binlog events // clear compress binlog events
event.setNeedDmlParse(false); event.setNeedDmlParse(false);
event.setNeedIterate(false);
event.setIterateEntrys(null); event.setIterateEntrys(null);
event.setIterateTables(null); event.setIterateTables(null);
event.setIterateEvents(null); event.setIterateEvents(null);

4
pom.xml
View File

@@ -301,7 +301,7 @@
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-all</artifactId> <artifactId>netty-all</artifactId>
<version>4.1.46.Final</version> <version>4.1.68.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.netty</groupId> <groupId>org.jboss.netty</groupId>
@@ -357,7 +357,7 @@
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>1.4.196</version> <version>2.1.210</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>