From d5b797ad9f9620f298b0c0c5242eced9bd3bce58 Mon Sep 17 00:00:00 2001 From: sunxiaojian Date: Sat, 13 May 2023 00:19:14 +0800 Subject: [PATCH] Move package to parent pom and fixed e2e --- pom.xml | 20 +++++++++++++++---- seatunnel-dist/pom.xml | 8 -------- .../imap-storage-file/pom.xml | 7 +++++-- tools/dependencies/known-dependencies.txt | 9 ++++++--- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 14b4efa4118e..ba4736881937 100644 --- a/pom.xml +++ b/pom.xml @@ -143,11 +143,9 @@ 3.0.0 - 2.8.3 2.4.7 3.1.4 - 1.11.271 - 4.1.89.Final + 4.1.60.Final @@ -460,19 +458,33 @@ 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} - provided + diff --git a/seatunnel-dist/pom.xml b/seatunnel-dist/pom.xml index ddb48591a967..1978daaf4c25 100644 --- a/seatunnel-dist/pom.xml +++ b/seatunnel-dist/pom.xml @@ -99,7 +99,6 @@ 3.0.0 - 2.8.3 2.4.7 3.1.4 1.11.271 @@ -588,13 +587,6 @@ provided - - com.aliyun.oss - aliyun-sdk-oss - ${aliyun-sdk.version} - provided - - org.apache.hadoop hadoop-aws 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 664b45dcb12a..c39ddda99c85 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 @@ -67,13 +67,16 @@ org.apache.hadoop hadoop-aliyun - provided + + + + net.minidev + json-smart org.apache.hadoop hadoop-aws - provided diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index 277aa4797aff..6eab8139f8e7 100755 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -22,8 +22,8 @@ protostuff-collectionschema-1.8.0.jar protostuff-core-1.8.0.jar protostuff-runtime-1.8.0.jar scala-library-2.11.12.jar -seatunnel-jackson-2.3.1-SNAPSHOT-optional.jar -seatunnel-guava-2.3.1-SNAPSHOT-optional.jar +seatunnel-jackson-2.3.2-SNAPSHOT-optional.jar +seatunnel-guava-2.3.2-SNAPSHOT-optional.jar slf4j-api-1.7.25.jar jsqlparser-4.5.jar animal-sniffer-annotations-1.17.jar @@ -34,4 +34,7 @@ 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 \ No newline at end of file +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 \ No newline at end of file