Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#2606]Dependency management split #2630

Merged
merged 3 commits into from
Sep 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
327 changes: 3 additions & 324 deletions pom.xml

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions seatunnel-apis/seatunnel-api-flink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>seatunnel-api-flink</artifactId>

<properties>
<avro.version>1.8.2</avro.version>
</properties>

<dependencies>
<dependency>
Expand Down
5 changes: 5 additions & 0 deletions seatunnel-apis/seatunnel-api-spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>seatunnel-api-spark</artifactId>

<properties>
<lz4.version>1.3.0</lz4.version>
</properties>

<dependencies>
<dependency>
Expand Down Expand Up @@ -63,6 +67,7 @@
<dependency>
<groupId>net.jpountz.lz4</groupId>
<artifactId>lz4</artifactId>
<version>${lz4.version}</version>
</dependency>
</dependencies>

Expand Down
17 changes: 7 additions & 10 deletions seatunnel-connectors-v2/connector-clickhouse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,15 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>connector-clickhouse</artifactId>

<properties>
<clickhouse.version>0.3.2-patch9</clickhouse.version>
<sshd.scp.version>2.7.0</sshd.scp.version>
</properties>
<dependencies>

<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-api</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-scp</artifactId>
<version>${sshd.scp.version}</version>
</dependency>

<dependency>
Expand All @@ -50,7 +47,7 @@
<dependency>
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-http-client</artifactId>
<version>0.3.2-patch9</version>
<version>${clickhouse.version}</version>
</dependency>

<dependency>
Expand All @@ -62,7 +59,7 @@
<dependency>
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
<version>0.3.2-patch9</version>
<version>${clickhouse.version}</version>
</dependency>

</dependencies>
Expand Down
11 changes: 0 additions & 11 deletions seatunnel-connectors-v2/connector-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,4 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>connector-common</artifactId>

<properties>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
5 changes: 5 additions & 0 deletions seatunnel-connectors-v2/connector-datahub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>connector-datahub</artifactId>

<properties>
<datahub.version>2.19.0-public</datahub.version>
</properties>

<dependencies>
<dependency>
Expand All @@ -37,6 +41,7 @@
<dependency>
<groupId>com.aliyun.datahub</groupId>
<artifactId>aliyun-sdk-datahub</artifactId>
<version>${datahub.version}</version>
</dependency>

</dependencies>
Expand Down
5 changes: 4 additions & 1 deletion seatunnel-connectors-v2/connector-dingtalk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<dingtalk.service.version>2.0.0</dingtalk.service.version>
</properties>

<artifactId>connector-dingtalk</artifactId>

Expand All @@ -37,7 +40,7 @@
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>alibaba-dingtalk-service-sdk</artifactId>
<version>2.0.0</version>
<version>${dingtalk.service.version}</version>
</dependency>
</dependencies>

Expand Down
11 changes: 6 additions & 5 deletions seatunnel-connectors-v2/connector-elasticsearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>connector-elasticsearch</artifactId>

<properties>
<elasticsearch-rest-client.version>7.5.1</elasticsearch-rest-client.version>
<jackson.databind.version>2.12.6</jackson.databind.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
Expand All @@ -43,6 +43,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
</dependencies>

Expand Down
10 changes: 5 additions & 5 deletions seatunnel-connectors-v2/connector-email/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>connector-email</artifactId>

<properties>
<email.version>1.5.6</email.version>
</properties>

<dependencies>
<dependency>
Expand All @@ -38,11 +42,7 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-api</artifactId>
<version>${project.version}</version>
<version>${email.version}</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,26 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>connector-file-base</artifactId>

<properties>
<commons-net.version>3.6</commons-net.version>
<orc.version>1.5.6</orc.version>
<commons.collecton4.version>4.4</commons.collecton4.version>
<commons.lang3.version>3.4</commons.lang3.version>
<flink.hadoop.version>2.7.5-7.0</flink.hadoop.version>
<parquet-avro.version>1.10.0</parquet-avro.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop-2</artifactId>
<version>${flink.hadoop.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

Expand Down Expand Up @@ -59,16 +79,19 @@
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
<version>${parquet-avro.version}</version>
</dependency>

<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>${commons-net.version}</version>
</dependency>

<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
<version>${orc.version}</version>
<exclusions>
<exclusion>
<artifactId>hadoop-common</artifactId>
Expand All @@ -80,17 +103,18 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>${commons.collecton4.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop-2</artifactId>
<scope>provided</scope>
</dependency>

</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop-2</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop-2</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>connector-file-oss</artifactId>
<properties>
<hadoop-aliyun.version>2.9.2</hadoop-aliyun.version>
</properties>

<dependencies>

Expand All @@ -36,16 +39,10 @@
<artifactId>connector-file-base</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop-2</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aliyun</artifactId>
<version>${hadoop-aliyun.version}</version>
</dependency>

</dependencies>
Expand Down
Loading