diff --git a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/pom.xml b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/pom.xml index 58b5ca3f408..4fe4176da95 100644 --- a/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/pom.xml +++ b/seatunnel-connectors-v2/connector-cdc/connector-cdc-mysql/pom.xml @@ -64,6 +64,12 @@ io.debezium debezium-connector-mysql + + + mysql + mysql-connector-java + + org.apache.seatunnel diff --git a/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/pom.xml b/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/pom.xml index 3d54cd4b1b9..11abf8b8904 100644 --- a/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/pom.xml +++ b/seatunnel-connectors-v2/connector-cdc/connector-cdc-sqlserver/pom.xml @@ -57,6 +57,12 @@ io.debezium debezium-connector-sqlserver + + + com.microsoft.sqlserver + mssql-jdbc + + diff --git a/seatunnel-connectors-v2/connector-jdbc/pom.xml b/seatunnel-connectors-v2/connector-jdbc/pom.xml index 7b451df1208..e76237e7e07 100644 --- a/seatunnel-connectors-v2/connector-jdbc/pom.xml +++ b/seatunnel-connectors-v2/connector-jdbc/pom.xml @@ -30,7 +30,7 @@ SeaTunnel : Connectors V2 : Jdbc - 8.0.16 + 8.0.27 42.4.3 8.1.2.141 9.2.1.jre8 diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/pom.xml b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/pom.xml index e6588aeecca..539fce1890b 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/pom.xml @@ -25,6 +25,18 @@ connector-cdc-mysql-e2e SeaTunnel : E2E : Connector V2 : CDC MySql + + + + org.apache.seatunnel + connector-jdbc + ${project.version} + pom + import + + + + @@ -47,5 +59,11 @@ mysql ${testcontainer.version} + + + mysql + mysql-connector-java + test + diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/MysqlCDCIT.java b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/MysqlCDCIT.java index adb3a598692..1d0d90853fc 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/MysqlCDCIT.java +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/java/org/apache/seatunnel/connectors/seatunnel/cdc/mysql/MysqlCDCIT.java @@ -22,14 +22,17 @@ import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.UniqueDatabase; import org.apache.seatunnel.e2e.common.TestResource; import org.apache.seatunnel.e2e.common.TestSuiteBase; +import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory; import org.apache.seatunnel.e2e.common.container.EngineType; import org.apache.seatunnel.e2e.common.container.TestContainer; import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer; +import org.apache.seatunnel.e2e.common.junit.TestContainerExtension; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.TestTemplate; +import org.testcontainers.containers.Container; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.lifecycle.Startables; import org.testcontainers.utility.DockerLoggerFactory; @@ -102,6 +105,22 @@ private static MySqlContainer createMySqlContainer(MySqlVersion version) { return mySqlContainer; } + private String driverUrl() { + return "https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.0.32/mysql-connector-j-8.0.32.jar"; + } + + @TestContainerExtension + protected final ContainerExtendedFactory extendedFactory = + container -> { + Container.ExecResult extraCommands = + container.execInContainer( + "bash", + "-c", + "mkdir -p /tmp/seatunnel/plugins/MySQL-CDC/lib && cd /tmp/seatunnel/plugins/MySQL-CDC/lib && wget " + + driverUrl()); + Assertions.assertEquals(0, extraCommands.getExitCode(), extraCommands.getStderr()); + }; + @BeforeAll @Override public void startUp() throws ClassNotFoundException, InterruptedException { diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/resources/log4j2-test.properties b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/resources/log4j2-test.properties index d1ca535f2be..d01e745df74 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/resources/log4j2-test.properties +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-mysql-e2e/src/test/resources/log4j2-test.properties @@ -18,8 +18,8 @@ ################################################################################ # Set root logger level to OFF to not flood build logs -# set manually to INFO for debugging purposes -rootLogger.level=INFO +# The amount of logs is too large to be suitable for troubleshooting, manually set to WARN. +rootLogger.level=WARN rootLogger.appenderRef.test.ref = TestLogger appender.testlogger.name = TestLogger diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/pom.xml b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/pom.xml index 7d7376f1adc..0c5a0fa8e07 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/pom.xml @@ -25,6 +25,18 @@ connector-cdc-sqlserver-e2e SeaTunnel : E2E : Connector V2 : CDC SqlServer + + + + org.apache.seatunnel + connector-jdbc + ${project.version} + pom + import + + + + @@ -59,5 +71,10 @@ ${project.version} test + + + com.microsoft.sqlserver + mssql-jdbc + diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/src/test/java/org/apache/seatunnel/e2e/connector/cdc/sqlserver/SqlServerCDCIT.java b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/src/test/java/org/apache/seatunnel/e2e/connector/cdc/sqlserver/SqlServerCDCIT.java index d1f0fd130d3..8bca3e3b036 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/src/test/java/org/apache/seatunnel/e2e/connector/cdc/sqlserver/SqlServerCDCIT.java +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-cdc-sqlserver-e2e/src/test/java/org/apache/seatunnel/e2e/connector/cdc/sqlserver/SqlServerCDCIT.java @@ -19,9 +19,11 @@ import org.apache.seatunnel.e2e.common.TestResource; import org.apache.seatunnel.e2e.common.TestSuiteBase; +import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory; import org.apache.seatunnel.e2e.common.container.EngineType; import org.apache.seatunnel.e2e.common.container.TestContainer; import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer; +import org.apache.seatunnel.e2e.common.junit.TestContainerExtension; import org.awaitility.Awaitility; import org.awaitility.core.ConditionTimeoutException; @@ -29,6 +31,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.TestTemplate; +import org.testcontainers.containers.Container; import org.testcontainers.containers.MSSQLServerContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.lifecycle.Startables; @@ -92,6 +95,22 @@ public class SqlServerCDCIT extends TestSuiteBase implements TestResource { new Slf4jLogConsumer( DockerLoggerFactory.getLogger("sqlserver-docker-image"))); + private String driverUrl() { + return "https://repo1.maven.org/maven2/com/microsoft/sqlserver/mssql-jdbc/9.4.1.jre8/mssql-jdbc-9.4.1.jre8.jar"; + } + + @TestContainerExtension + protected final ContainerExtendedFactory extendedFactory = + container -> { + Container.ExecResult extraCommands = + container.execInContainer( + "bash", + "-c", + "mkdir -p /tmp/seatunnel/plugins/SqlServer-CDC/lib && cd /tmp/seatunnel/plugins/SqlServer-CDC/lib && wget " + + driverUrl()); + Assertions.assertEquals(0, extraCommands.getExitCode(), extraCommands.getStderr()); + }; + @Override @BeforeAll public void startUp() throws Exception { diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-kafka-e2e/pom.xml b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-kafka-e2e/pom.xml index ead4c654c24..81cbb785698 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-kafka-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-kafka-e2e/pom.xml @@ -25,9 +25,17 @@ connector-kafka-e2e SeaTunnel : E2E : Connector V2 : Kafka - - 42.4.3 - + + + + org.apache.seatunnel + connector-jdbc + ${project.version} + pom + import + + + @@ -82,7 +90,6 @@ org.postgresql postgresql - ${postgresql.version} test @@ -97,6 +104,11 @@ ${testcontainer.version} test + + mysql + mysql-connector-java + test + diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-pulsar-e2e/pom.xml b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-pulsar-e2e/pom.xml index f4db6fc0f48..f817fdc155b 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-pulsar-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-pulsar-e2e/pom.xml @@ -25,12 +25,17 @@ connector-pulsar-e2e SeaTunnel : E2E : Connector V2 : Pulsar - - 8 - 8 - UTF-8 - 42.4.3 - + + + + org.apache.seatunnel + connector-jdbc + ${project.version} + pom + import + + + @@ -93,7 +98,11 @@ org.postgresql postgresql - ${postgresql.version} + test + + + mysql + mysql-connector-java test diff --git a/seatunnel-e2e/seatunnel-e2e-common/src/test/resources/log4j2.properties b/seatunnel-e2e/seatunnel-e2e-common/src/test/resources/log4j2.properties index 2dc1b8ca501..26190157fd5 100644 --- a/seatunnel-e2e/seatunnel-e2e-common/src/test/resources/log4j2.properties +++ b/seatunnel-e2e/seatunnel-e2e-common/src/test/resources/log4j2.properties @@ -16,7 +16,7 @@ # limitations under the License. ################################################################################ -rootLogger.level = INFO +rootLogger.level = WARN rootLogger.appenderRef.consoleStdout.ref = consoleStdoutAppender rootLogger.appenderRef.consoleStderr.ref = consoleStderrAppender diff --git a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2-test.properties b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2-test.properties index 0999f948766..f0090af0248 100644 --- a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2-test.properties +++ b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2-test.properties @@ -16,13 +16,13 @@ # limitations under the License. ################################################################################ -rootLogger.level = INFO +rootLogger.level = WARN rootLogger.appenderRef.consoleStdout.ref = consoleStdoutAppender rootLogger.appenderRef.consoleStderr.ref = consoleStderrAppender logger.zeta.name=org.apache.seatunnel.engine -logger.zeta.level=DEBUG +logger.zeta.level=WARN appender.consoleStdout.name = consoleStdoutAppender appender.consoleStdout.type = CONSOLE diff --git a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2.properties b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2.properties index 7b9977bd6ea..fc0c2063b7a 100644 --- a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2.properties +++ b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/log4j2.properties @@ -16,10 +16,10 @@ # limitations under the License. ################################################################################ -rootLogger.level = INFO +rootLogger.level = WARN logger.zeta.name=org.apache.seatunnel.engine -logger.zeta.level=INFO +logger.zeta.level=WARN logger.debezium.name=io.debezium.connector logger.debezium.level=WARN