From 5fe67232c736e1af5231b51f2385a05b7fe96937 Mon Sep 17 00:00:00 2001 From: JingsongLi Date: Sun, 13 Sep 2026 17:00:47 +0800 Subject: [PATCH] [improve][fs] Reduce bundled S3 and Hadoop dependencies --- .../paimon-hadoop-shaded-3.4/pom.xml | 6 ++ .../src/main/resources/META-INF/NOTICE | 7 --- paimon-filesystems/paimon-s3-impl/pom.xml | 58 ++++--------------- .../src/main/resources/META-INF/NOTICE | 3 - .../transform/XmlResponsesSaxParser.java | 2 +- 5 files changed, 19 insertions(+), 57 deletions(-) rename paimon-filesystems/paimon-s3-impl/src/{main => test}/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java (99%) diff --git a/paimon-filesystems/paimon-hadoop-shaded-3.4/pom.xml b/paimon-filesystems/paimon-hadoop-shaded-3.4/pom.xml index 328977f23ad6..29ed882e6ff6 100644 --- a/paimon-filesystems/paimon-hadoop-shaded-3.4/pom.xml +++ b/paimon-filesystems/paimon-hadoop-shaded-3.4/pom.xml @@ -130,6 +130,12 @@ org.apache.kerby kerb-simplekdc + + + com.google.guava + guava + org.apache.curator curator-client diff --git a/paimon-filesystems/paimon-hadoop-shaded-3.4/src/main/resources/META-INF/NOTICE b/paimon-filesystems/paimon-hadoop-shaded-3.4/src/main/resources/META-INF/NOTICE index 814ba28142d5..b13ed8fb8411 100644 --- a/paimon-filesystems/paimon-hadoop-shaded-3.4/src/main/resources/META-INF/NOTICE +++ b/paimon-filesystems/paimon-hadoop-shaded-3.4/src/main/resources/META-INF/NOTICE @@ -10,10 +10,6 @@ This project bundles the following dependencies under the Apache Software Licens - com.fasterxml.jackson.core:jackson-core:2.12.7 - com.fasterxml.jackson.core:jackson-databind:2.12.7 - com.fasterxml.woodstox:woodstox-core:5.3.0 -- com.google.guava:failureaccess:1.0 -- com.google.guava:guava:27.0-jre -- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -- com.google.j2objc:j2objc-annotations:1.1 - commons-beanutils:commons-beanutils:1.9.4 - commons-collections:commons-collections:3.2.2 - commons-io:commons-io:2.8.0 @@ -35,10 +31,7 @@ This project bundles the following dependencies under the Apache Software Licens - com.google.code.findbugs:jsr305:1.3.9 This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT). -You find them under licenses/LICENSE.checker-framework-qualifiers and licenses/LICENSE.animal-sniffer. -- org.checkerframework:checker-qual:2.5.2 -- org.codehaus.mojo:animal-sniffer-annotations:1.17 - org.slf4j:slf4j-api:1.7.32 This project bundles the following dependencies under BSD-2 License (https://opensource.org/licenses/BSD-2-Clause). diff --git a/paimon-filesystems/paimon-s3-impl/pom.xml b/paimon-filesystems/paimon-s3-impl/pom.xml index dd58b52d6314..7dd9d0fdbd2c 100644 --- a/paimon-filesystems/paimon-s3-impl/pom.xml +++ b/paimon-filesystems/paimon-s3-impl/pom.xml @@ -49,27 +49,12 @@ provided - + com.amazonaws aws-java-sdk-core ${fs.s3.aws.version} - - com.amazonaws - aws-java-sdk-s3 - ${fs.s3.aws.version} - - - com.amazonaws - aws-java-sdk-kms - ${fs.s3.aws.version} - - - com.amazonaws - aws-java-sdk-dynamodb - ${fs.s3.aws.version} - com.amazonaws aws-java-sdk-sts @@ -111,7 +96,9 @@ - + software.amazon.awssdk apache-client @@ -132,11 +119,6 @@ http-auth-aws-crt ${fs.s3.awssdk.version} - - software.amazon.awssdk - iam - ${fs.s3.awssdk.version} - software.amazon.awssdk sso @@ -152,26 +134,11 @@ kms ${fs.s3.awssdk.version} - - software.amazon.awssdk - glue - ${fs.s3.awssdk.version} - software.amazon.awssdk sts ${fs.s3.awssdk.version} - - software.amazon.awssdk - dynamodb - ${fs.s3.awssdk.version} - - - software.amazon.awssdk - lakeformation - ${fs.s3.awssdk.version} - software.amazon.awssdk s3-transfer-manager @@ -187,6 +154,14 @@ provided + + + com.amazonaws + aws-java-sdk-s3 + ${fs.s3.aws.version} + test + + org.apache.paimon paimon-common @@ -309,15 +284,6 @@ META-INF/LICENSE.txt - - com.amazonaws:aws-java-sdk-s3 - - - com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser** - - diff --git a/paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/NOTICE b/paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/NOTICE index 93355a0576c0..657a61b2fe30 100644 --- a/paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/NOTICE +++ b/paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/NOTICE @@ -7,9 +7,6 @@ The Apache Software Foundation (http://www.apache.org/). This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - com.amazonaws:aws-java-sdk-core:1.12.319 -- com.amazonaws:aws-java-sdk-dynamodb:1.12.319 -- com.amazonaws:aws-java-sdk-kms:1.12.319 -- com.amazonaws:aws-java-sdk-s3:1.12.319 - com.amazonaws:aws-java-sdk-sts:1.12.319 - com.amazonaws:jmespath-java:1.12.319 - com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6 diff --git a/paimon-filesystems/paimon-s3-impl/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java b/paimon-filesystems/paimon-s3-impl/src/test/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java similarity index 99% rename from paimon-filesystems/paimon-s3-impl/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java rename to paimon-filesystems/paimon-s3-impl/src/test/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java index eb1e3f21ddd6..0748e3d71fd5 100644 --- a/paimon-filesystems/paimon-s3-impl/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java +++ b/paimon-filesystems/paimon-s3-impl/src/test/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java @@ -148,7 +148,7 @@ // This class is copied from aws-java-sdk-s3 (Apache License 2.0) // in order to replaced {@code XMLReaderFactory.createXMLReader} by // {@code SAX_PARSER_FACTORY.newSAXParser().getXMLReader()} to -// avoid JDK-8015099. +// avoid JDK-8015099 when the MinIO test fixture uses the SDK v1 client. // // ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------