Skip to content

Commit 1eee23e

Browse files
agapplezoemak
authored andcommitted
upgrade spring cloud & spring boot version
1 parent ac13b33 commit 1eee23e

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

admin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
<dependency>
3232
<groupId>org.springframework.cloud</groupId>
3333
<artifactId>spring-cloud-context</artifactId>
34-
<version>2.0.0.RELEASE</version>
34+
<version>3.0.6</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.springframework.boot</groupId>
3838
<artifactId>spring-boot-dependencies</artifactId>
39-
<version>2.0.1.RELEASE</version>
39+
<version>2.5.4</version>
4040
<type>pom</type>
4141
<scope>import</scope>
4242
</dependency>

client-adapter/launcher/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>org.springframework.boot</groupId>
1919
<artifactId>spring-boot-dependencies</artifactId>
20-
<version>2.0.1.RELEASE</version>
20+
<version>2.5.4</version>
2121
<type>pom</type>
2222
<scope>import</scope>
2323
</dependency>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
import org.springframework.boot.Banner;
44
import org.springframework.boot.SpringApplication;
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
6+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
67

78
/**
89
* 启动入口
910
*
1011
* @author rewerma @ 2018-10-20
1112
* @version 1.0.0
1213
*/
13-
@SpringBootApplication
14+
@SpringBootApplication(exclude= { DataSourceAutoConfiguration.class})
1415
public class CanalAdapterApplication {
1516
public static void main(String[] args) {
1617
// 支持rocketmq client 配置日志路径

client-adapter/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@
110110
<dependency>
111111
<groupId>org.springframework.cloud</groupId>
112112
<artifactId>spring-cloud-context</artifactId>
113-
<version>2.0.0.RELEASE</version>
113+
<version>3.0.6</version>
114114
</dependency>
115115
<dependency>
116116
<groupId>org.springframework.boot</groupId>
117117
<artifactId>spring-boot</artifactId>
118-
<version>2.0.1.RELEASE</version>
118+
<version>2.5.4</version>
119119
</dependency>
120120
<dependency>
121121
<groupId>com.h2database</groupId>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ public void onEvent(MessageEvent event, long sequence, boolean endOfBatch) throw
426426
event.setEntry(null);
427427
// clear compress binlog events
428428
event.setNeedDmlParse(false);
429+
event.setNeedIterate(false);
429430
event.setIterateEntrys(null);
430431
event.setIterateTables(null);
431432
event.setIterateEvents(null);

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@
301301
<dependency>
302302
<groupId>io.netty</groupId>
303303
<artifactId>netty-all</artifactId>
304-
<version>4.1.46.Final</version>
304+
<version>4.1.68.Final</version>
305305
</dependency>
306306
<dependency>
307307
<groupId>org.jboss.netty</groupId>
@@ -357,7 +357,7 @@
357357
<dependency>
358358
<groupId>com.h2database</groupId>
359359
<artifactId>h2</artifactId>
360-
<version>1.4.196</version>
360+
<version>2.1.210</version>
361361
</dependency>
362362
<dependency>
363363
<groupId>mysql</groupId>

0 commit comments

Comments
 (0)