This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 573306bfb3 move imap storage file dependency packages to submodules
(#5218)
573306bfb3 is described below
commit 573306bfb312823722dc695f779665e19dda866c
Author: Xiaojian Sun <[email protected]>
AuthorDate: Fri Aug 4 11:17:18 2023 +0800
move imap storage file dependency packages to submodules (#5218)
---
pom.xml | 38 ----------------------
.../src/main/assembly/assembly-bin-ci.xml | 1 +
.../imap-storage-plugins/imap-storage-file/pom.xml | 19 ++++++++---
tools/dependencies/known-dependencies.txt | 5 +--
4 files changed, 16 insertions(+), 47 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7dce624be3..3d61964495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,11 +141,6 @@
<awaitility.version>4.2.0</awaitility.version>
<e2e.dependency.skip>true</e2e.dependency.skip>
- <!-- Imap storage dependency package -->
- <hadoop-aliyun.version>3.0.0</hadoop-aliyun.version>
- <json-smart.version>2.4.7</json-smart.version>
- <hadoop-aws.version>3.1.4</hadoop-aws.version>
- <netty-buffer.version>4.1.60.Final</netty-buffer.version>
</properties>
<dependencyManagement>
@@ -452,39 +447,6 @@
<scope>provided</scope>
</dependency>
- <!-- Imap storage dependency package -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-aliyun</artifactId>
- <version>${hadoop-aliyun.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <version>${json-smart.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-aws</artifactId>
- <version>${hadoop-aws.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- <version>${netty-buffer.version}</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
diff --git a/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
b/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
index 3a1b5a4177..de11af1e17 100644
--- a/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
+++ b/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
@@ -178,6 +178,7 @@
<!--Add netty buffer jar -->
<include>io.netty:netty-buffer:jar</include>
<include>io.netty:netty-common:jar</include>
+
</includes>
<outputFileNameMapping>${artifact.file.name}</outputFileNameMapping>
<outputDirectory>/lib</outputDirectory>
diff --git
a/seatunnel-engine/seatunnel-engine-storage/imap-storage-plugins/imap-storage-file/pom.xml
b/seatunnel-engine/seatunnel-engine-storage/imap-storage-plugins/imap-storage-file/pom.xml
index c39ddda99c..a742fe39a0 100644
---
a/seatunnel-engine/seatunnel-engine-storage/imap-storage-plugins/imap-storage-file/pom.xml
+++
b/seatunnel-engine/seatunnel-engine-storage/imap-storage-plugins/imap-storage-file/pom.xml
@@ -30,6 +30,14 @@
<artifactId>imap-storage-file</artifactId>
<name>SeaTunnel : Engine : Storage : IMap Storage Plugins : File</name>
+ <properties>
+ <!-- Imap storage dependency package -->
+ <hadoop-aliyun.version>3.0.0</hadoop-aliyun.version>
+ <json-smart.version>2.4.7</json-smart.version>
+ <hadoop-aws.version>3.1.4</hadoop-aws.version>
+ <netty-buffer.version>4.1.60.Final</netty-buffer.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.seatunnel</groupId>
@@ -64,24 +72,25 @@
<artifactId>awaitility</artifactId>
</dependency>
+ <!-- Imap storage dependency package -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aliyun</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
+ <version>${hadoop-aliyun.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
+ <version>${hadoop-aws.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
+ <version>${netty-buffer.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/tools/dependencies/known-dependencies.txt
b/tools/dependencies/known-dependencies.txt
index 70bbd1c0df..11e5c57b8a 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -34,7 +34,4 @@ j2objc-annotations-1.1.jar
jsr305-1.3.9.jar
jsr305-3.0.0.jar
jsr305-3.0.2.jar
-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
-accessors-smart-2.4.7.jar
-asm-9.1.jar
-json-smart-2.4.7.jar
+listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
\ No newline at end of file
