Skip to content

Commit b65f40c

Browse files
liugddxliugddx
authored
[Improve][CDC]Remove driver for cdc connector (#4952)
1 parent d62cf0f commit b65f40c

File tree

13 files changed

+125
-19
lines changed

13 files changed

+125
-19
lines changed

‎seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@
6464
<dependency>
6565
<groupId>io.debezium</groupId>
6666
<artifactId>debezium-connector-mysql</artifactId>
67+
<exclusions>
68+
<exclusion>
69+
<groupId>mysql</groupId>
70+
<artifactId>mysql-connector-java</artifactId>
71+
</exclusion>
72+
</exclusions>
6773
</dependency>
6874
<dependency>
6975
<groupId>org.apache.seatunnel</groupId>

‎seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@
5757
<dependency>
5858
<groupId>io.debezium</groupId>
5959
<artifactId>debezium-connector-sqlserver</artifactId>
60+
<exclusions>
61+
<exclusion>
62+
<groupId>com.microsoft.sqlserver</groupId>
63+
<artifactId>mssql-jdbc</artifactId>
64+
</exclusion>
65+
</exclusions>
6066
</dependency>
6167

6268
<dependency>

‎seatunnel-connectors-v2/connector-jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<name>SeaTunnel : Connectors V2 : Jdbc</name>
3131

3232
<properties>
33-
<mysql.version>8.0.16</mysql.version>
33+
<mysql.version>8.0.27</mysql.version>
3434
<postgresql.version>42.4.3</postgresql.version>
3535
<dm-jdbc.version>8.1.2.141</dm-jdbc.version>
3636
<sqlserver.version>9.2.1.jre8</sqlserver.version>

‎seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,18 @@
2525
<artifactId>connector-cdc-mysql-e2e</artifactId>
2626
<name>SeaTunnel : E2E : Connector V2 : CDC MySql</name>
2727

28+
<dependencyManagement>
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.seatunnel</groupId>
32+
<artifactId>connector-jdbc</artifactId>
33+
<version>${project.version}</version>
34+
<type>pom</type>
35+
<scope>import</scope>
36+
</dependency>
37+
</dependencies>
38+
</dependencyManagement>
39+
2840
<dependencies>
2941
<!-- SeaTunnel connectors -->
3042
<dependency>
@@ -47,5 +59,11 @@
4759
<artifactId>mysql</artifactId>
4860
<version>${testcontainer.version}</version>
4961
</dependency>
62+
63+
<dependency>
64+
<groupId>mysql</groupId>
65+
<artifactId>mysql-connector-java</artifactId>
66+
<scope>test</scope>
67+
</dependency>
5068
</dependencies>
5169
</project>

‎seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/MysqlCDCIT.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,17 @@
2222
import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.UniqueDatabase;
2323
import org.apache.seatunnel.e2e.common.TestResource;
2424
import org.apache.seatunnel.e2e.common.TestSuiteBase;
25+
import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory;
2526
import org.apache.seatunnel.e2e.common.container.EngineType;
2627
import org.apache.seatunnel.e2e.common.container.TestContainer;
2728
import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
29+
import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;
2830

2931
import org.junit.jupiter.api.AfterAll;
3032
import org.junit.jupiter.api.Assertions;
3133
import org.junit.jupiter.api.BeforeAll;
3234
import org.junit.jupiter.api.TestTemplate;
35+
import org.testcontainers.containers.Container;
3336
import org.testcontainers.containers.output.Slf4jLogConsumer;
3437
import org.testcontainers.lifecycle.Startables;
3538
import org.testcontainers.utility.DockerLoggerFactory;
@@ -102,6 +105,22 @@ private static MySqlContainer createMySqlContainer(MySqlVersion version) {
102105
return mySqlContainer;
103106
}
104107

108+
private String driverUrl() {
109+
return "https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.0.32/mysql-connector-j-8.0.32.jar";
110+
}
111+
112+
@TestContainerExtension
113+
protected final ContainerExtendedFactory extendedFactory =
114+
container -> {
115+
Container.ExecResult extraCommands =
116+
container.execInContainer(
117+
"bash",
118+
"-c",
119+
"mkdir -p /tmp/seatunnel/plugins/MySQL-CDC/lib && cd /tmp/seatunnel/plugins/MySQL-CDC/lib && wget "
120+
+ driverUrl());
121+
Assertions.assertEquals(0, extraCommands.getExitCode(), extraCommands.getStderr());
122+
};
123+
105124
@BeforeAll
106125
@Override
107126
public void startUp() throws ClassNotFoundException, InterruptedException {

‎seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/resources/log4j2-test.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
################################################################################
1919

2020
# Set root logger level to OFF to not flood build logs
21-
# set manually to INFO for debugging purposes
22-
rootLogger.level=INFO
21+
# The amount of logs is too large to be suitable for troubleshooting, manually set to WARN.
22+
rootLogger.level=WARN
2323
rootLogger.appenderRef.test.ref = TestLogger
2424

2525
appender.testlogger.name = TestLogger

‎seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/pom.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,18 @@
2525
<artifactId>connector-cdc-sqlserver-e2e</artifactId>
2626
<name>SeaTunnel : E2E : Connector V2 : CDC SqlServer</name>
2727

28+
<dependencyManagement>
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.seatunnel</groupId>
32+
<artifactId>connector-jdbc</artifactId>
33+
<version>${project.version}</version>
34+
<type>pom</type>
35+
<scope>import</scope>
36+
</dependency>
37+
</dependencies>
38+
</dependencyManagement>
39+
2840
<dependencies>
2941
<!-- SeaTunnel connectors -->
3042
<dependency>
@@ -59,5 +71,10 @@
5971
<version>${project.version}</version>
6072
<scope>test</scope>
6173
</dependency>
74+
75+
<dependency>
76+
<groupId>com.microsoft.sqlserver</groupId>
77+
<artifactId>mssql-jdbc</artifactId>
78+
</dependency>
6279
</dependencies>
6380
</project>

‎seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/src/test/java/org/apache/seatunnel/e2e/connector/cdc/sqlserver/SqlServerCDCIT.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,19 @@
1919

2020
import org.apache.seatunnel.e2e.common.TestResource;
2121
import org.apache.seatunnel.e2e.common.TestSuiteBase;
22+
import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory;
2223
import org.apache.seatunnel.e2e.common.container.EngineType;
2324
import org.apache.seatunnel.e2e.common.container.TestContainer;
2425
import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
26+
import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;
2527

2628
import org.awaitility.Awaitility;
2729
import org.awaitility.core.ConditionTimeoutException;
2830
import org.junit.jupiter.api.AfterAll;
2931
import org.junit.jupiter.api.Assertions;
3032
import org.junit.jupiter.api.BeforeAll;
3133
import org.junit.jupiter.api.TestTemplate;
34+
import org.testcontainers.containers.Container;
3235
import org.testcontainers.containers.MSSQLServerContainer;
3336
import org.testcontainers.containers.output.Slf4jLogConsumer;
3437
import org.testcontainers.lifecycle.Startables;
@@ -92,6 +95,22 @@ public class SqlServerCDCIT extends TestSuiteBase implements TestResource {
9295
new Slf4jLogConsumer(
9396
DockerLoggerFactory.getLogger("sqlserver-docker-image")));
9497

98+
private String driverUrl() {
99+
return "https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/9.4.1.jre8/mssql-jdbc-9.4.1.jre8.jar";
100+
}
101+
102+
@TestContainerExtension
103+
protected final ContainerExtendedFactory extendedFactory =
104+
container -> {
105+
Container.ExecResult extraCommands =
106+
container.execInContainer(
107+
"bash",
108+
"-c",
109+
"mkdir -p /tmp/seatunnel/plugins/SqlServer-CDC/lib && cd /tmp/seatunnel/plugins/SqlServer-CDC/lib && wget "
110+
+ driverUrl());
111+
Assertions.assertEquals(0, extraCommands.getExitCode(), extraCommands.getStderr());
112+
};
113+
95114
@Override
96115
@BeforeAll
97116
public void startUp() throws Exception {

‎seatunnel-e2e/seatunnel-connector-v2-e2e/connector-kafka-e2e/pom.xml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,17 @@
2525
<artifactId>connector-kafka-e2e</artifactId>
2626
<name>SeaTunnel : E2E : Connector V2 : Kafka</name>
2727

28-
<properties>
29-
<postgresql.version>42.4.3</postgresql.version>
30-
</properties>
28+
<dependencyManagement>
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.seatunnel</groupId>
32+
<artifactId>connector-jdbc</artifactId>
33+
<version>${project.version}</version>
34+
<type>pom</type>
35+
<scope>import</scope>
36+
</dependency>
37+
</dependencies>
38+
</dependencyManagement>
3139

3240
<dependencies>
3341
<dependency>
@@ -82,7 +90,6 @@
8290
<dependency>
8391
<groupId>org.postgresql</groupId>
8492
<artifactId>postgresql</artifactId>
85-
<version>${postgresql.version}</version>
8693
<scope>test</scope>
8794
</dependency>
8895
<dependency>
@@ -97,6 +104,11 @@
97104
<version>${testcontainer.version}</version>
98105
<scope>test</scope>
99106
</dependency>
107+
<dependency>
108+
<groupId>mysql</groupId>
109+
<artifactId>mysql-connector-java</artifactId>
110+
<scope>test</scope>
111+
</dependency>
100112
</dependencies>
101113

102114
</project>

‎seatunnel-e2e/seatunnel-connector-v2-e2e/connector-pulsar-e2e/pom.xml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,17 @@
2525
<artifactId>connector-pulsar-e2e</artifactId>
2626
<name>SeaTunnel : E2E : Connector V2 : Pulsar</name>
2727

28-
<properties>
29-
<maven.compiler.source>8</maven.compiler.source>
30-
<maven.compiler.target>8</maven.compiler.target>
31-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32-
<postgresql.version>42.4.3</postgresql.version>
33-
</properties>
28+
<dependencyManagement>
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.seatunnel</groupId>
32+
<artifactId>connector-jdbc</artifactId>
33+
<version>${project.version}</version>
34+
<type>pom</type>
35+
<scope>import</scope>
36+
</dependency>
37+
</dependencies>
38+
</dependencyManagement>
3439

3540
<dependencies>
3641
<dependency>
@@ -93,7 +98,11 @@
9398
<dependency>
9499
<groupId>org.postgresql</groupId>
95100
<artifactId>postgresql</artifactId>
96-
<version>${postgresql.version}</version>
101+
<scope>test</scope>
102+
</dependency>
103+
<dependency>
104+
<groupId>mysql</groupId>
105+
<artifactId>mysql-connector-java</artifactId>
97106
<scope>test</scope>
98107
</dependency>
99108
</dependencies>

0 commit comments

Comments
 (0)