diff --git a/pom.xml b/pom.xml index 9214fd14f9cb..e73aef19c4be 100644 --- a/pom.xml +++ b/pom.xml @@ -207,25 +207,6 @@ seatunnel-config-shade ${seatunnel.config.shade.version} - - - - mysql - mysql-connector-java - ${mysql.version} - test - - - - org.postgresql - postgresql - ${postgresql.version} - - - com.dameng - DmJdbcDriver18 - ${dm-jdbc.version} - commons-codec commons-codec diff --git a/seatunnel-connectors-v2/connector-jdbc/pom.xml b/seatunnel-connectors-v2/connector-jdbc/pom.xml index 38534b22009c..f2d76d23f05a 100644 --- a/seatunnel-connectors-v2/connector-jdbc/pom.xml +++ b/seatunnel-connectors-v2/connector-jdbc/pom.xml @@ -31,8 +31,6 @@ 5.2.5-HBase-2.x - 42.3.3 - 8.0.16 @@ -47,7 +45,12 @@ org.postgresql postgresql - ${pg.version} + ${postgresql.version} + + + com.dameng + DmJdbcDriver18 + ${dm-jdbc.version} @@ -55,10 +58,7 @@ ali-phoenix-shaded-thin-client ${phoenix.version} - - com.dameng - DmJdbcDriver18 - + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/pom.xml index e4361c3592e0..789c3d6a5f33 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/pom.xml @@ -24,7 +24,6 @@ 4.0.0 connector-jdbc-flink-e2e - org.apache.seatunnel @@ -46,6 +45,22 @@ 1.17.3 test + + mysql + mysql-connector-java + ${mysql.version} + provided + + + org.postgresql + postgresql + ${postgresql.version} + + + com.dameng + DmJdbcDriver18 + ${dm-jdbc.version} + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/jdbc/JdbcDmdbIT.java b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/jdbc/JdbcDmdbIT.java similarity index 94% rename from seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/jdbc/JdbcDmdbIT.java rename to seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/jdbc/JdbcDmdbIT.java index deca96d5ad29..c0ee456e9bb6 100644 --- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/jdbc/JdbcDmdbIT.java +++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/jdbc/JdbcDmdbIT.java @@ -42,9 +42,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; @@ -113,14 +110,6 @@ private void initializeJdbcTable() { } } - private static List generateTestDataset() { - List rows = new ArrayList<>(); - for (int i = 1; i <= 100; i++) { - rows.add(Arrays.asList(i, String.format("test_%s", i))); - } - return rows; - } - private void assertHasData(String table) { try (Connection connection = DriverManager.getConnection(URL, USERNAME, PASSWORD)) { Statement statement = connection.createStatement(); diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/resources/jdbc/init_sql/dm_init.conf b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/src/test/resources/jdbc/init_sql/dm_init.conf similarity index 100% rename from seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/resources/jdbc/init_sql/dm_init.conf rename to seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/src/test/resources/jdbc/init_sql/dm_init.conf diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/resources/jdbc/jdbc_dm_source_and_sink.conf b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/src/test/resources/jdbc/jdbc_dm_source_and_sink.conf similarity index 100% rename from seatunnel-e2e/seatunnel-flink-connector-v2-e2e/src/test/resources/jdbc/jdbc_dm_source_and_sink.conf rename to seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/src/test/resources/jdbc/jdbc_dm_source_and_sink.conf diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml index 8d96fb66a382..a5242ef72c40 100644 --- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml @@ -40,6 +40,23 @@ ${project.version} test + + mysql + mysql-connector-java + ${mysql.version} + provided + + + + org.postgresql + postgresql + ${postgresql.version} + + + com.dameng + DmJdbcDriver18 + ${dm-jdbc.version} + \ No newline at end of file diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/jdbc/JDBCDmdbIT.java b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/jdbc/JDBCDmdbIT.java similarity index 100% rename from seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/jdbc/JDBCDmdbIT.java rename to seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/jdbc/JDBCDmdbIT.java diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/resources/jdbc/init_sql/dm_init.conf b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/src/test/resources/jdbc/init_sql/dm_init.conf similarity index 100% rename from seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/resources/jdbc/init_sql/dm_init.conf rename to seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/src/test/resources/jdbc/init_sql/dm_init.conf diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/resources/jdbc/jdbc_dm_source_and_sink.conf b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/src/test/resources/jdbc/jdbc_dm_source_and_sink.conf similarity index 100% rename from seatunnel-e2e/seatunnel-spark-connector-v2-e2e/src/test/resources/jdbc/jdbc_dm_source_and_sink.conf rename to seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/src/test/resources/jdbc/jdbc_dm_source_and_sink.conf diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml index 7a4a2f6e2d1d..a7a084bac140 100644 --- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml @@ -55,11 +55,6 @@ - - com.dameng - DmJdbcDriver18 - test - org.awaitility diff --git a/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-jdbc-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-jdbc-e2e/pom.xml index aecd54f826f2..cbc494bfafcb 100644 --- a/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-jdbc-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-jdbc-e2e/pom.xml @@ -49,7 +49,7 @@ org.postgresql postgresql - test + ${postgresql.version} diff --git a/seatunnel-server/seatunnel-app/pom.xml b/seatunnel-server/seatunnel-app/pom.xml index 8d6c821dcf74..84a3420c2ae5 100644 --- a/seatunnel-server/seatunnel-app/pom.xml +++ b/seatunnel-server/seatunnel-app/pom.xml @@ -133,6 +133,7 @@ mysql mysql-connector-java + ${mysql.version} provided