From b76ad51e1e2f212bc50036ab0dc7ee0a7d453469 Mon Sep 17 00:00:00 2001 From: Xiaojian Sun Date: Fri, 4 Aug 2023 11:17:18 +0800 Subject: [PATCH] move imap storage file dependency packages to submodules (#5218) --- pom.xml | 38 ------------------- .../src/main/assembly/assembly-bin-ci.xml | 1 + .../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 7dce624be315..3d619644952b 100644 --- a/pom.xml +++ b/pom.xml @@ -141,11 +141,6 @@ 4.2.0 true - - 3.0.0 - 2.4.7 - 3.1.4 - 4.1.60.Final @@ -452,39 +447,6 @@ provided - - - org.apache.hadoop - hadoop-aliyun - ${hadoop-aliyun.version} - provided - - - net.minidev - json-smart - - - - - - net.minidev - json-smart - ${json-smart.version} - - - - org.apache.hadoop - hadoop-aws - ${hadoop-aws.version} - provided - - - - io.netty - netty-buffer - ${netty-buffer.version} - - diff --git a/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml b/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml index 3a1b5a4177ed..de11af1e173c 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 @@ io.netty:netty-buffer:jar io.netty:netty-common:jar + ${artifact.file.name} /lib 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 c39ddda99c85..a742fe39a0b9 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 @@ imap-storage-file SeaTunnel : Engine : Storage : IMap Storage Plugins : File + + + 3.0.0 + 2.4.7 + 3.1.4 + 4.1.60.Final + + org.apache.seatunnel @@ -64,24 +72,25 @@ awaitility + org.apache.hadoop hadoop-aliyun - - - - net.minidev - json-smart + ${hadoop-aliyun.version} + provided org.apache.hadoop hadoop-aws + ${hadoop-aws.version} + provided io.netty netty-buffer + ${netty-buffer.version} provided diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index 70bbd1c0df53..11e5c57b8af9 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