Skip to content

Commit

Permalink
update pom
Browse files Browse the repository at this point in the history
  • Loading branch information
@laglangyue
laglangyue committed Sep 6, 2022
1 parent a54f72a commit 70fb0b8
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 44 deletions.
19 changes: 0 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,25 +207,6 @@
<artifactId>seatunnel-config-shade</artifactId>
<version>${seatunnel.config.shade.version}</version>
</dependency>

<!--Because the license is not in compliance, if you need to use MySQL, you can add it yourself-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>${dm-jdbc.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down
14 changes: 7 additions & 7 deletions seatunnel-connectors-v2/connector-jdbc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

<properties>
<phoenix.version>5.2.5-HBase-2.x</phoenix.version>
<pg.version>42.3.3</pg.version>
<mysql.version>8.0.16</mysql.version>
</properties>

<dependencies>
Expand All @@ -47,18 +45,20 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${pg.version}</version>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>${dm-jdbc.version}</version>
</dependency>

<dependency>
<groupId>com.aliyun.phoenix</groupId>
<artifactId>ali-phoenix-shaded-thin-client</artifactId>
<version>${phoenix.version}</version>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
</dependency>

</dependencies>

</project>
17 changes: 16 additions & 1 deletion seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>connector-jdbc-flink-e2e</artifactId>

<dependencies>
<dependency>
<groupId>org.apache.seatunnel</groupId>
Expand All @@ -46,6 +45,22 @@
<version>1.17.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>${dm-jdbc.version}</version>
</dependency>
</dependencies>

</project>
11 changes: 0 additions & 11 deletions ...atunnel/e2e/flink/v2/jdbc/JdbcDmdbIT.java → ...atunnel/e2e/flink/v2/jdbc/JdbcDmdbIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -113,14 +110,6 @@ private void initializeJdbcTable() {
}
}

private static List<List> generateTestDataset() {
List<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();
Expand Down
0 ...test/resources/jdbc/init_sql/dm_init.conf → ...test/resources/jdbc/init_sql/dm_init.conf
View file
File renamed without changes.
0 ...sources/jdbc/jdbc_dm_source_and_sink.conf → ...sources/jdbc/jdbc_dm_source_and_sink.conf
View file
File renamed without changes.
17 changes: 17 additions & 0 deletions seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,23 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>${dm-jdbc.version}</version>
</dependency>
</dependencies>

</project>
0 ...atunnel/e2e/spark/v2/jdbc/JDBCDmdbIT.java → ...atunnel/e2e/spark/v2/jdbc/JDBCDmdbIT.java
View file
File renamed without changes.
0 ...test/resources/jdbc/init_sql/dm_init.conf → ...test/resources/jdbc/init_sql/dm_init.conf
View file
File renamed without changes.
0 ...sources/jdbc/jdbc_dm_source_and_sink.conf → ...sources/jdbc/jdbc_dm_source_and_sink.conf
View file
File renamed without changes.
5 changes: 0 additions & 5 deletions seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.awaitility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion seatunnel-e2e/seatunnel-spark-e2e/seatunnel-connector-spark-jdbc-e2e/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>test</scope>
<version>${postgresql.version}</version>
</dependency>
</dependencies>

Expand Down
1 change: 1 addition & 0 deletions seatunnel-server/seatunnel-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
<scope>provided</scope>
</dependency>

Expand Down

0 comments on commit 70fb0b8

Please sign in to comment.