Skip to content

Commit fc047be

Browse files
CalvinKirsCalvinKirs
authored
[apache#2606]Dependency management split (apache#2630)
* [apache#2606]Dependency management split apache#2606 subtask * set seatunnel-api scope to provide * add seatunnel-api dependency
1 parent 9288948 commit fc047be

File tree

26 files changed

+287
-432
lines changed

26 files changed

+287
-432
lines changed

‎pom.xml

+3-324
Large diffs are not rendered by default.

‎seatunnel-apis/seatunnel-api-flink/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<modelVersion>4.0.0</modelVersion>
3030

3131
<artifactId>seatunnel-api-flink</artifactId>
32+
33+
<properties>
34+
<avro.version>1.8.2</avro.version>
35+
</properties>
3236

3337
<dependencies>
3438
<dependency>

‎seatunnel-apis/seatunnel-api-spark/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
<modelVersion>4.0.0</modelVersion>
3030

3131
<artifactId>seatunnel-api-spark</artifactId>
32+
33+
<properties>
34+
<lz4.version>1.3.0</lz4.version>
35+
</properties>
3236

3337
<dependencies>
3438
<dependency>
@@ -63,6 +67,7 @@
6367
<dependency>
6468
<groupId>net.jpountz.lz4</groupId>
6569
<artifactId>lz4</artifactId>
70+
<version>${lz4.version}</version>
6671
</dependency>
6772
</dependencies>
6873

‎seatunnel-connectors-v2/connector-clickhouse/pom.xml

+7-10
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,15 @@
2727
<modelVersion>4.0.0</modelVersion>
2828

2929
<artifactId>connector-clickhouse</artifactId>
30-
30+
<properties>
31+
<clickhouse.version>0.3.2-patch9</clickhouse.version>
32+
<sshd.scp.version>2.7.0</sshd.scp.version>
33+
</properties>
3134
<dependencies>
32-
33-
<dependency>
34-
<groupId>org.apache.seatunnel</groupId>
35-
<artifactId>seatunnel-api</artifactId>
36-
<version>${project.version}</version>
37-
</dependency>
38-
3935
<dependency>
4036
<groupId>org.apache.sshd</groupId>
4137
<artifactId>sshd-scp</artifactId>
38+
<version>${sshd.scp.version}</version>
4239
</dependency>
4340

4441
<dependency>
@@ -50,7 +47,7 @@
5047
<dependency>
5148
<groupId>com.clickhouse</groupId>
5249
<artifactId>clickhouse-http-client</artifactId>
53-
<version>0.3.2-patch9</version>
50+
<version>${clickhouse.version}</version>
5451
</dependency>
5552

5653
<dependency>
@@ -62,7 +59,7 @@
6259
<dependency>
6360
<groupId>com.clickhouse</groupId>
6461
<artifactId>clickhouse-jdbc</artifactId>
65-
<version>0.3.2-patch9</version>
62+
<version>${clickhouse.version}</version>
6663
</dependency>
6764

6865
</dependencies>

‎seatunnel-connectors-v2/connector-common/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,4 @@
2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>connector-common</artifactId>
31-
32-
<properties>
33-
</properties>
34-
35-
<dependencies>
36-
<dependency>
37-
<groupId>org.apache.seatunnel</groupId>
38-
<artifactId>seatunnel-api</artifactId>
39-
<version>${project.version}</version>
40-
</dependency>
41-
</dependencies>
4231
</project>

‎seatunnel-connectors-v2/connector-datahub/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<modelVersion>4.0.0</modelVersion>
2727

2828
<artifactId>connector-datahub</artifactId>
29+
30+
<properties>
31+
<datahub.version>2.19.0-public</datahub.version>
32+
</properties>
2933

3034
<dependencies>
3135
<dependency>
@@ -37,6 +41,7 @@
3741
<dependency>
3842
<groupId>com.aliyun.datahub</groupId>
3943
<artifactId>aliyun-sdk-datahub</artifactId>
44+
<version>${datahub.version}</version>
4045
</dependency>
4146

4247
</dependencies>

‎seatunnel-connectors-v2/connector-dingtalk/pom.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<version>${revision}</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
27+
<properties>
28+
<dingtalk.service.version>2.0.0</dingtalk.service.version>
29+
</properties>
2730

2831
<artifactId>connector-dingtalk</artifactId>
2932

@@ -37,7 +40,7 @@
3740
<dependency>
3841
<groupId>com.aliyun</groupId>
3942
<artifactId>alibaba-dingtalk-service-sdk</artifactId>
40-
<version>2.0.0</version>
43+
<version>${dingtalk.service.version}</version>
4144
</dependency>
4245
</dependencies>
4346

‎seatunnel-connectors-v2/connector-elasticsearch/pom.xml

+6-5
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>connector-elasticsearch</artifactId>
31+
32+
<properties>
33+
<elasticsearch-rest-client.version>7.5.1</elasticsearch-rest-client.version>
34+
<jackson.databind.version>2.12.6</jackson.databind.version>
35+
</properties>
3136

3237
<dependencies>
33-
<dependency>
34-
<groupId>org.apache.seatunnel</groupId>
35-
<artifactId>seatunnel-api</artifactId>
36-
<version>${project.version}</version>
37-
</dependency>
3838
<dependency>
3939
<groupId>org.elasticsearch.client</groupId>
4040
<artifactId>elasticsearch-rest-client</artifactId>
@@ -43,6 +43,7 @@
4343
<dependency>
4444
<groupId>com.fasterxml.jackson.core</groupId>
4545
<artifactId>jackson-databind</artifactId>
46+
<version>${jackson.databind.version}</version>
4647
</dependency>
4748
</dependencies>
4849

‎seatunnel-connectors-v2/connector-email/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>connector-email</artifactId>
31+
32+
<properties>
33+
<email.version>1.5.6</email.version>
34+
</properties>
3135

3236
<dependencies>
3337
<dependency>
@@ -38,11 +42,7 @@
3842
<dependency>
3943
<groupId>com.sun.mail</groupId>
4044
<artifactId>javax.mail</artifactId>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.apache.seatunnel</groupId>
44-
<artifactId>seatunnel-api</artifactId>
45-
<version>${project.version}</version>
45+
<version>${email.version}</version>
4646
</dependency>
4747
</dependencies>
4848

‎seatunnel-connectors-v2/connector-file/connector-file-base/pom.xml

+25-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,26 @@
2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>connector-file-base</artifactId>
31+
32+
<properties>
33+
<commons-net.version>3.6</commons-net.version>
34+
<orc.version>1.5.6</orc.version>
35+
<commons.collecton4.version>4.4</commons.collecton4.version>
36+
<commons.lang3.version>3.4</commons.lang3.version>
37+
<flink.hadoop.version>2.7.5-7.0</flink.hadoop.version>
38+
<parquet-avro.version>1.10.0</parquet-avro.version>
39+
</properties>
40+
41+
<dependencyManagement>
42+
<dependencies>
43+
<dependency>
44+
<groupId>org.apache.flink</groupId>
45+
<artifactId>flink-shaded-hadoop-2</artifactId>
46+
<version>${flink.hadoop.version}</version>
47+
<scope>provided</scope>
48+
</dependency>
49+
</dependencies>
50+
</dependencyManagement>
3151

3252
<dependencies>
3353

@@ -59,16 +79,19 @@
5979
<dependency>
6080
<groupId>org.apache.parquet</groupId>
6181
<artifactId>parquet-avro</artifactId>
82+
<version>${parquet-avro.version}</version>
6283
</dependency>
6384

6485
<dependency>
6586
<groupId>commons-net</groupId>
6687
<artifactId>commons-net</artifactId>
88+
<version>${commons-net.version}</version>
6789
</dependency>
6890

6991
<dependency>
7092
<groupId>org.apache.orc</groupId>
7193
<artifactId>orc-core</artifactId>
94+
<version>${orc.version}</version>
7295
<exclusions>
7396
<exclusion>
7497
<artifactId>hadoop-common</artifactId>
@@ -80,17 +103,18 @@
80103
<dependency>
81104
<groupId>org.apache.commons</groupId>
82105
<artifactId>commons-collections4</artifactId>
106+
<version>${commons.collecton4.version}</version>
83107
</dependency>
84108

85109
<dependency>
86110
<groupId>org.apache.commons</groupId>
87111
<artifactId>commons-lang3</artifactId>
112+
<version>${commons.lang3.version}</version>
88113
</dependency>
89114

90115
<dependency>
91116
<groupId>org.apache.flink</groupId>
92117
<artifactId>flink-shaded-hadoop-2</artifactId>
93-
<scope>provided</scope>
94118
</dependency>
95119

96120
</dependencies>

‎seatunnel-connectors-v2/connector-file/connector-file-hadoop/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<dependency>
3939
<groupId>org.apache.flink</groupId>
4040
<artifactId>flink-shaded-hadoop-2</artifactId>
41-
<scope>provided</scope>
4241
</dependency>
4342
</dependencies>
4443
</project>

‎seatunnel-connectors-v2/connector-file/connector-file-local/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<dependency>
3939
<groupId>org.apache.flink</groupId>
4040
<artifactId>flink-shaded-hadoop-2</artifactId>
41-
<scope>provided</scope>
4241
</dependency>
4342
</dependencies>
4443
</project>

‎seatunnel-connectors-v2/connector-file/connector-file-oss/pom.xml

+4-7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>connector-file-oss</artifactId>
31+
<properties>
32+
<hadoop-aliyun.version>2.9.2</hadoop-aliyun.version>
33+
</properties>
3134

3235
<dependencies>
3336

@@ -36,16 +39,10 @@
3639
<artifactId>connector-file-base</artifactId>
3740
<version>${project.version}</version>
3841
</dependency>
39-
40-
<dependency>
41-
<groupId>org.apache.flink</groupId>
42-
<artifactId>flink-shaded-hadoop-2</artifactId>
43-
<scope>provided</scope>
44-
</dependency>
45-
4642
<dependency>
4743
<groupId>org.apache.hadoop</groupId>
4844
<artifactId>hadoop-aliyun</artifactId>
45+
<version>${hadoop-aliyun.version}</version>
4946
</dependency>
5047

5148
</dependencies>

0 commit comments

Comments
 (0)