You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by fa...@apache.org on 2022/08/15 10:19:11 UTC
[incubator-seatunnel] branch dev updated: [Feature][e2e] Update module dependency to avoid old/new connector dependency package conflicts (#2414)
This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new a2d38bfd0 [Feature][e2e] Update module dependency to avoid old/new connector dependency package conflicts (#2414)
a2d38bfd0 is described below
commit a2d38bfd0b4b253be97ac9e7782be6e6d421d393
Author: hailin0 <ha...@gmail.com>
AuthorDate: Mon Aug 15 18:19:06 2022 +0800
[Feature][e2e] Update module dependency to avoid old/new connector dependency package conflicts (#2414)
Co-authored-by: wanghailin <ha...@fiture.com>
---
seatunnel-e2e/pom.xml | 15 ++-------------
seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml | 5 +++++
seatunnel-e2e/seatunnel-flink-e2e/pom.xml | 17 +++++------------
seatunnel-e2e/seatunnel-flink-sql-e2e/pom.xml | 10 +++++-----
seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml | 5 +++--
seatunnel-e2e/seatunnel-spark-e2e/pom.xml | 14 ++++++++------
6 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/seatunnel-e2e/pom.xml b/seatunnel-e2e/pom.xml
index 96b39a420..32c6e4369 100644
--- a/seatunnel-e2e/pom.xml
+++ b/seatunnel-e2e/pom.xml
@@ -39,19 +39,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-connectors-v2-dist</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-connectors-spark-dist</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-connectors-flink-dist</artifactId>
- <version>${project.version}</version>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
</dependency>
<!-- Testcontainers 1.x is tightly coupled with the JUnit 4.x rule API-->
diff --git a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml
index 454a41c95..b4c2f6081 100644
--- a/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml
+++ b/seatunnel-e2e/seatunnel-flink-connector-v2-e2e/pom.xml
@@ -31,6 +31,11 @@
<artifactId>seatunnel-core-flink</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connectors-v2-dist</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.testcontainers</groupId>
diff --git a/seatunnel-e2e/seatunnel-flink-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-e2e/pom.xml
index a0651cc1f..e3ca433fe 100644
--- a/seatunnel-e2e/seatunnel-flink-e2e/pom.xml
+++ b/seatunnel-e2e/seatunnel-flink-e2e/pom.xml
@@ -32,22 +32,15 @@
<artifactId>seatunnel-core-flink</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connectors-flink-dist</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-connector-flink-clickhouse</artifactId>
- <version>${project.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/seatunnel-e2e/seatunnel-flink-sql-e2e/pom.xml b/seatunnel-e2e/seatunnel-flink-sql-e2e/pom.xml
index e8cdd8390..4cb8ca086 100644
--- a/seatunnel-e2e/seatunnel-flink-sql-e2e/pom.xml
+++ b/seatunnel-e2e/seatunnel-flink-sql-e2e/pom.xml
@@ -31,17 +31,17 @@
<artifactId>seatunnel-core-flink-sql</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connectors-flink-sql-dist</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml
index 732d9e51b..925bbd385 100644
--- a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml
+++ b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/pom.xml
@@ -33,8 +33,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connectors-v2-dist</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/seatunnel-e2e/seatunnel-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-e2e/pom.xml
index 85a516165..44a5d54d0 100644
--- a/seatunnel-e2e/seatunnel-spark-e2e/pom.xml
+++ b/seatunnel-e2e/seatunnel-spark-e2e/pom.xml
@@ -28,18 +28,20 @@
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-core-spark</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-core-spark</artifactId>
+ <artifactId>seatunnel-connectors-spark-dist</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>