From d90066e01b8b8f9a1afd52eeae23c2ff49ad0328 Mon Sep 17 00:00:00 2001
From: "jianghang.loujh" <jianghang.loujh@alibaba-inc.com>
Date: Fri, 1 Sep 2023 19:51:49 +0800
Subject: [PATCH] upgrade spring cloud & spring boot version

---
 admin/pom.xml                                                 | 4 ++--
 client-adapter/launcher/pom.xml                               | 2 +-
 .../otter/canal/adapter/launcher/CanalAdapterApplication.java | 3 ++-
 client-adapter/pom.xml                                        | 4 ++--
 .../canal/parse/inbound/mysql/MysqlMultiStageCoprocessor.java | 1 +
 pom.xml                                                       | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/admin/pom.xml b/admin/pom.xml
index f4ae8b00..18d22405 100644
--- a/admin/pom.xml
+++ b/admin/pom.xml
@@ -31,12 +31,12 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-context</artifactId>
-                <version>2.0.0.RELEASE</version>
+                <version>3.0.6</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.0.1.RELEASE</version>
+                <version>2.5.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/client-adapter/launcher/pom.xml b/client-adapter/launcher/pom.xml
index 1afbade9..6683f5bb 100644
--- a/client-adapter/launcher/pom.xml
+++ b/client-adapter/launcher/pom.xml
@@ -17,7 +17,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.0.1.RELEASE</version>
+                <version>2.5.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/CanalAdapterApplication.java b/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/CanalAdapterApplication.java
index bf67d57c..2e3501dd 100644
--- a/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/CanalAdapterApplication.java
+++ b/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/CanalAdapterApplication.java
@@ -3,6 +3,7 @@ package com.alibaba.otter.canal.adapter.launcher;
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 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
  * @version 1.0.0
  */
-@SpringBootApplication
+@SpringBootApplication(exclude= { DataSourceAutoConfiguration.class})
 public class CanalAdapterApplication {
     public static void main(String[] args) {
         // 支持rocketmq client 配置日志路径
diff --git a/client-adapter/pom.xml b/client-adapter/pom.xml
index 7f916036..802a6050 100644
--- a/client-adapter/pom.xml
+++ b/client-adapter/pom.xml
@@ -110,12 +110,12 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-context</artifactId>
-                <version>2.0.0.RELEASE</version>
+                <version>3.0.6</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot</artifactId>
-                <version>2.0.1.RELEASE</version>
+                <version>2.5.4</version>
             </dependency>
             <dependency>
                 <groupId>com.h2database</groupId>
diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlMultiStageCoprocessor.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlMultiStageCoprocessor.java
index e0bd16f3..2aa38c17 100644
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlMultiStageCoprocessor.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlMultiStageCoprocessor.java
@@ -426,6 +426,7 @@ public class MysqlMultiStageCoprocessor extends AbstractCanalLifeCycle implement
                 event.setEntry(null);
                 // clear compress binlog events
                 event.setNeedDmlParse(false);
+                event.setNeedIterate(false);
                 event.setIterateEntrys(null);
                 event.setIterateTables(null);
                 event.setIterateEvents(null);
diff --git a/pom.xml b/pom.xml
index a74a1a2c..37f3c22c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,7 +301,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-all</artifactId>
-                <version>4.1.46.Final</version>
+                <version>4.1.68.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.netty</groupId>
@@ -357,7 +357,7 @@
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
-                <version>1.4.196</version>
+                <version>2.1.210</version>
             </dependency>
             <dependency>
                 <groupId>mysql</groupId>