Revert "修复测试类报错 (#4516 )"

This reverts commit d899981354.
修复测试类报错 (#4516 )
2026-11-04 00:30:15 +08:00 · 2022-12-06 16:41:17 +08:00 · 2022-12-06 16:17:01 +08:00 · 2022-06-13 09:39:29 +08:00 · 2022-06-13 09:31:46 +08:00 · 2022-06-10 13:36:39 +08:00
41 changed files with 44 additions and 44 deletions
--- a/admin/admin-ui/pom.xml
+++ b/admin/admin-ui/pom.xml
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>canal.admin</artifactId>
    <groupId>com.alibaba.otter</groupId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

--- a/admin/admin-web/pom.xml
+++ b/admin/admin-web/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.admin</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>canal.admin-web</artifactId>
--- a/admin/pom.xml
+++ b/admin/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.alibaba.otter</groupId>
    <artifactId>canal.admin</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>canal admin module for otter ${project.version}</name>
    <modules>
--- a/client-adapter/common/pom.xml
+++ b/client-adapter/common/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/es6x/pom.xml
+++ b/client-adapter/es6x/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/es7x/pom.xml
+++ b/client-adapter/es7x/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/escore/pom.xml
+++ b/client-adapter/escore/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/hbase/pom.xml
+++ b/client-adapter/hbase/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/kudu/pom.xml
+++ b/client-adapter/kudu/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/launcher/pom.xml
+++ b/client-adapter/launcher/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/logger/pom.xml
+++ b/client-adapter/logger/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/phoenix/pom.xml
+++ b/client-adapter/phoenix/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/pom.xml
+++ b/client-adapter/pom.xml
@@ -4,12 +4,12 @@
    <parent>
        <groupId>com.alibaba.otter</groupId>
        <artifactId>canal</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <groupId>com.alibaba.otter</groupId>
    <artifactId>canal.client-adapter</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>canal client adapter module for otter ${project.version}</name>

--- a/client-adapter/rdb/pom.xml
+++ b/client-adapter/rdb/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/tablestore/pom.xml
+++ b/client-adapter/tablestore/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.common</artifactId>
--- a/connector/core/pom.xml
+++ b/connector/core/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.alibaba.otter</groupId>
--- a/connector/kafka-connector/pom.xml
+++ b/connector/kafka-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>com.alibaba.otter</groupId>
        <artifactId>canal</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>com.alibaba.otter</groupId>
    <artifactId>canal.connector</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>canal connector module for otter ${project.version}</name>

--- a/connector/pulsarmq-connector/pom.xml
+++ b/connector/pulsarmq-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/connector/rabbitmq-connector/pom.xml
+++ b/connector/rabbitmq-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/connector/rocketmq-connector/pom.xml
+++ b/connector/rocketmq-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/connector/tcp-connector/pom.xml
+++ b/connector/tcp-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/dbsync/pom.xml
+++ b/dbsync/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/deployer/pom.xml
+++ b/deployer/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>com.alibaba.otter</groupId>
        <artifactId>canal</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <groupId>com.alibaba.otter</groupId>
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/filter/pom.xml
+++ b/filter/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/instance/core/pom.xml
+++ b/instance/core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.instance.core</artifactId>
--- a/instance/manager/pom.xml
+++ b/instance/manager/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/instance/spring/pom.xml
+++ b/instance/spring/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/meta/pom.xml
+++ b/meta/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/parse/pom.xml
+++ b/parse/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.parse</artifactId>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <artifactId>canal</artifactId>
    <packaging>pom</packaging>
    <name>canal module for otter ${project.version}</name>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <url>https://github.com/alibaba/canal</url>
    <parent>
        <groupId>org.sonatype.oss</groupId>
--- a/prometheus/pom.xml
+++ b/prometheus/pom.xml
@@ -3,13 +3,13 @@
    <parent>
        <artifactId>canal</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <groupId>com.alibaba.otter</groupId>
    <artifactId>canal.prometheus</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <name>canal prometheus module for otter ${project.version}</name>
    <dependencies>
        <dependency>
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.server</artifactId>
--- a/sink/pom.xml
+++ b/sink/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
Author	SHA1	Message	Date
rewerma	f3bb0dd18d	Revert "修复测试类报错 (#4516 )" This reverts commit `d899981354`.	2022-12-06 16:41:17 +08:00
rewerma	d899981354	修复测试类报错 (#4516 ) * optimize YAML config loader (#4332) * fix bug BASE TABLE as table name (#4217) * fix issues#4328 (#4329) * docs: add nodejs canal client support (#4260) Co-authored-by: zhangxunwei <zhangxunwei@dxy.cn> * fix destination not encoded (#4279) * 修复Canal指定时间戳启动失效，总是从最新的点位开始同步问题 (#4348) * 支持用户自定义的CanalAlarmHandler * RowsLogEvent增加对TableMapLogEvent判空检查，防止NPE异常 * 修复Canal指定时间戳启动失效，总是从最新的点位开始同步问题, issue: #4347 Co-authored-by: 云时 <mingya.wmy@alibaba-inc.com> * fixed 4334 , support jdk8/jdk11 * fixed issue #4266 , typo * fixed issue #4243 , support auto register for cluster = null * fixed issue #4225 , support mysql version >= 8.0.26 heartbeat v2 * fixed issue #4308 , support query_log_event for maraiadb 10.10.1 * ignore compression event * support jdk11 * support druid 1.2.12 * fixed mariadb 10.x * sync canal-template.properties * update fastjson & druid version (#4406) * 修复升级2.0.4导致兼容的问题 * update druid & fastjson version * update fastjson version * update druid & fastjson version * meta.dat文件数据丢失 (#4397) * update fastjson & druid version (#4438) * 局部变量线程安全，优先使用StringBuilder替换StringBuffer (#4472) Co-authored-by: 夏亮 <xialiang@newerabc.com> * 1. CanalController stop 需要同时将 embededCanalServer.stop (#4477) 2. ServerRunningMonitor 线程池未正常回收，线程池管理与 start/stop保持一致 * vuln-fix: Use HTTPS instead of HTTP to resolve dependencies (#4437) This fixes a security vulnerability in this project where the `build.gradle` files were configuring Gradle to resolve dependencies over HTTP instead of HTTPS. Weakness: CWE-829: Inclusion of Functionality from Untrusted Control Sphere Severity: High CVSSS: 8.1 Detection: OpenRewrite Reported-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com> Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com> Bug-tracker: https://github.com/JLLeitschuh/security-research/issues/9 Co-authored-by: Moderne <team@moderne.io> Co-authored-by: Moderne <team@moderne.io> * fix_ETL同步mysql关键字报错 (#4346) Co-authored-by: foleyang <foleyang@cogobuy.com> * optimize code * use compact BigDecimal * performance optimize , 1. cache string names 2. cache Charset * performance optimize ,cache integer/long valueof * 测试类报错 Co-authored-by: gongchangyou <gongchangyou@gmail.com> Co-authored-by: ChanaLii <316529035@qq.com> Co-authored-by: zhangxunwei <zhangxunweia@gmail.com> Co-authored-by: zhangxunwei <zhangxunwei@dxy.cn> Co-authored-by: tianpeidong <39491687+tianpeidong@users.noreply.github.com> Co-authored-by: dataccs <dataccs@163.com> Co-authored-by: 云时 <mingya.wmy@alibaba-inc.com> Co-authored-by: jianghang.loujh <jianghang.loujh@alibaba-inc.com> Co-authored-by: 温绍锦 <shaojin.wensj@alibaba-inc.com> Co-authored-by: noaso <noasoso@gmail.com> Co-authored-by: HumanPassenger <40585855+HumanPassenger@users.noreply.github.com> Co-authored-by: 夏亮 <xialiang@newerabc.com> Co-authored-by: 华仔 <591327356@qq.com> Co-authored-by: Jonathan Leitschuh <jonathan.leitschuh@gmail.com> Co-authored-by: Moderne <team@moderne.io> Co-authored-by: 杰锅不是锅 <1105568074@qq.com> Co-authored-by: foleyang <foleyang@cogobuy.com>	2022-12-06 16:17:01 +08:00
jianghang.loujh	a96db39420	add polardb-x parser test	2022-06-13 09:39:29 +08:00
温绍锦	bac1d543f1	update fastjson & druid version (#4224 ) * 修复升级2.0.4导致兼容的问题 * update druid & fastjson version	2022-06-13 09:31:46 +08:00
jianghang.loujh	753fad6639	fixed issue #4216 , support polardb-x show tables	2022-06-10 13:36:39 +08:00
jianghang.loujh	bc4dceea1a	fixed issue #4216 , support polardb-x show databases	2022-06-10 11:37:52 +08:00
温绍锦	7aaee7b439	修复升级2.0.4导致兼容的问题 (#4202 )	2022-05-30 10:29:38 +08:00
温绍锦	e19bf1ecff	Fastjson2 compatible fix (#4189 ) * update fastjson2 version, 2.0.2 -> 2.0.3 * update fastjson & druid version * bug fix for fastjson2 compatible	2022-05-25 10:22:26 +08:00
jianghang.loujh	a99dc0cbe8	fixed testcase	2022-05-24 11:18:40 +08:00
jianghang.loujh	7b8ff04d20	[maven-release-plugin] prepare for next development iteration	2022-05-24 10:26:12 +08:00