[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
MRYOG · Sep 8, 2022 · 9bbea6f · 9bbea6f
1 parent 02c1569
commit 9bbea6f
Show file tree

Hide file tree

Showing 26 changed files with 287 additions and 432 deletions.
diff --git a/pom.xml b/pom.xml
diff --git a/seatunnel-apis/seatunnel-api-flink/pom.xml b/seatunnel-apis/seatunnel-api-flink/pom.xml
@@ -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>

diff --git a/seatunnel-apis/seatunnel-api-spark/pom.xml b/seatunnel-apis/seatunnel-api-spark/pom.xml
@@ -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>
@@ -63,6 +67,7 @@
         <dependency>
             <groupId>net.jpountz.lz4</groupId>
             <artifactId>lz4</artifactId>
+            <version>${lz4.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/seatunnel-connectors-v2/connector-clickhouse/pom.xml b/seatunnel-connectors-v2/connector-clickhouse/pom.xml
@@ -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>
@@ -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>
@@ -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>

diff --git a/seatunnel-connectors-v2/connector-common/pom.xml b/seatunnel-connectors-v2/connector-common/pom.xml
@@ -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>
diff --git a/seatunnel-connectors-v2/connector-datahub/pom.xml b/seatunnel-connectors-v2/connector-datahub/pom.xml
@@ -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>
@@ -37,6 +41,7 @@
     <dependency>
       <groupId>com.aliyun.datahub</groupId>
       <artifactId>aliyun-sdk-datahub</artifactId>
+        <version>${datahub.version}</version>
     </dependency>
 
   </dependencies>

diff --git a/seatunnel-connectors-v2/connector-dingtalk/pom.xml b/seatunnel-connectors-v2/connector-dingtalk/pom.xml
@@ -25,6 +25,9 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <dingtalk.service.version>2.0.0</dingtalk.service.version>
+    </properties>
 
   <artifactId>connector-dingtalk</artifactId>
 
@@ -38,7 +41,7 @@
     <dependency>
       <groupId>com.aliyun</groupId>
       <artifactId>alibaba-dingtalk-service-sdk</artifactId>
-      <version>2.0.0</version>
+      <version>${dingtalk.service.version}</version>
     </dependency>
 
     <dependency>

diff --git a/seatunnel-connectors-v2/connector-elasticsearch/pom.xml b/seatunnel-connectors-v2/connector-elasticsearch/pom.xml
@@ -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>
@@ -43,6 +43,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <version>${jackson.databind.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/seatunnel-connectors-v2/connector-email/pom.xml b/seatunnel-connectors-v2/connector-email/pom.xml
@@ -28,6 +28,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>connector-email</artifactId>
+
+    <properties>
+        <email.version>1.5.6</email.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -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>
 

diff --git a/seatunnel-connectors-v2/connector-file/connector-file-base/pom.xml b/seatunnel-connectors-v2/connector-file/connector-file-base/pom.xml
@@ -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>
 
@@ -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>
@@ -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>

diff --git a/seatunnel-connectors-v2/connector-file/connector-file-hadoop/pom.xml b/seatunnel-connectors-v2/connector-file/connector-file-hadoop/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-shaded-hadoop-2</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/seatunnel-connectors-v2/connector-file/connector-file-local/pom.xml b/seatunnel-connectors-v2/connector-file/connector-file-local/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-shaded-hadoop-2</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/seatunnel-connectors-v2/connector-file/connector-file-oss/pom.xml b/seatunnel-connectors-v2/connector-file/connector-file-oss/pom.xml
@@ -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>
 
@@ -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>