This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/dev/pr-13265-dcf97867ac13c04661a35af8568f2e3e40d07ef1 in repository https://gitbox.apache.org/repos/asf/seatunnel.git
commit a0ac9082af2f6ea1565bdf2d9fcce12ac00e18fd Author: zhiweiniu <[email protected]> AuthorDate: Fri Nov 13 13:55:35 2026 +0000 [Improve][Core] Upgrade all SeaTunnel Shade dependencies to 3.0.1 (#13265) --- docs/en/connectors/sink/Hive.md | 2 +- docs/en/connectors/sink/OssFile.md | 2 +- docs/en/connectors/source/Hive.md | 2 +- docs/en/connectors/source/OssFile.md | 2 +- docs/en/developer/shade-guide.md | 10 +++++----- docs/en/engines/zeta/download-seatunnel.md | 6 ++++-- docs/en/engines/zeta/hybrid-cluster-deployment.md | 10 +++++----- .../engines/zeta/separated-cluster-deployment.md | 10 +++++----- docs/zh/connectors/sink/Hive.md | 2 +- docs/zh/connectors/sink/OssFile.md | 2 +- docs/zh/connectors/source/Hive.md | 2 +- docs/zh/connectors/source/OssFile.md | 2 +- docs/zh/developer/shade-guide.md | 10 +++++----- docs/zh/engines/zeta/download-seatunnel.md | 6 ++++-- docs/zh/engines/zeta/hybrid-cluster-deployment.md | 6 +++--- .../engines/zeta/separated-cluster-deployment.md | 6 +++--- pom.xml | 4 ++-- seatunnel-core/seatunnel-starter/pom.xml | 9 +++++++++ seatunnel-dist/release-docs/LICENSE | 3 ++- .../release-docs/licenses/LICENSE-json-java.txt | 1 + .../seatunnel-resource-managers-e2e/pom.xml | 1 - tools/dependencies/known-dependencies.txt | 22 +++++++++++----------- 22 files changed, 67 insertions(+), 53 deletions(-) diff --git a/docs/en/connectors/sink/Hive.md b/docs/en/connectors/sink/Hive.md index ff1db55c621..3f5b5c5bae2 100644 --- a/docs/en/connectors/sink/Hive.md +++ b/docs/en/connectors/sink/Hive.md @@ -18,7 +18,7 @@ Write data to Apache Hive tables. The connector uses Hive Metastore for table ma In order to use this connector, You must ensure your spark/flink cluster already integrated hive. The tested hive version is 2.3.9 and 3.1.3 . -If you use SeaTunnel Engine, You need put seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar and hive-exec-3.1.3.jar and libfb303-0.9.3.jar in $SEATUNNEL_HOME/lib/ dir. +If you use SeaTunnel Engine, use the `seatunnel-shade-hadoop3-uber-*.jar` bundled in `$SEATUNNEL_HOME/lib/`. Add `hive-exec-3.1.3.jar` and `libfb303-0.9.3.jar` to the same directory. ::: ## Key features diff --git a/docs/en/connectors/sink/OssFile.md b/docs/en/connectors/sink/OssFile.md index 636ba2a6b33..0c78a1c0e89 100644 --- a/docs/en/connectors/sink/OssFile.md +++ b/docs/en/connectors/sink/OssFile.md @@ -19,7 +19,7 @@ import ChangeLog from '../changelog/connector-file-oss.md'; ### For SeaTunnel Zeta Engine -1. You must ensure `seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar`, `aliyun-sdk-oss-3.4.1.jar`, `hadoop-aliyun-3.1.4.jar` and `jdom-1.1.jar` in `${SEATUNNEL_HOME}/lib/` dir. +1. Use the `seatunnel-shade-hadoop3-uber-*.jar` bundled in `${SEATUNNEL_HOME}/lib/`. Add `aliyun-sdk-oss-3.4.1.jar`, `hadoop-aliyun-3.1.4.jar` and `jdom-1.1.jar` to the same directory. ## Key features diff --git a/docs/en/connectors/source/Hive.md b/docs/en/connectors/source/Hive.md index cd84394542d..4b4841411ed 100644 --- a/docs/en/connectors/source/Hive.md +++ b/docs/en/connectors/source/Hive.md @@ -18,7 +18,7 @@ Read data from Apache Hive tables. The connector talks to Hive Metastore for sch In order to use this connector, You must ensure your spark/flink cluster already integrated hive. The tested hive version is 2.3.9 and 3.1.3 . -If you use SeaTunnel Engine, You need put seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar and hive-exec-3.1.3.jar and libfb303-0.9.3.jar in $SEATUNNEL_HOME/lib/ dir. +If you use SeaTunnel Engine, use the `seatunnel-shade-hadoop3-uber-*.jar` bundled in `$SEATUNNEL_HOME/lib/`. Add `hive-exec-3.1.3.jar` and `libfb303-0.9.3.jar` to the same directory. ::: ## Key features diff --git a/docs/en/connectors/source/OssFile.md b/docs/en/connectors/source/OssFile.md index d7ed8c158f1..1db0e6fac9a 100644 --- a/docs/en/connectors/source/OssFile.md +++ b/docs/en/connectors/source/OssFile.md @@ -19,7 +19,7 @@ import ChangeLog from '../changelog/connector-file-oss.md'; ### For SeaTunnel Zeta Engine -1. You must ensure `seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar`, `aliyun-sdk-oss-3.4.1.jar`, `hadoop-aliyun-3.1.4.jar` and `jdom-1.1.jar` in `${SEATUNNEL_HOME}/lib/` dir. +1. Use the `seatunnel-shade-hadoop3-uber-*.jar` bundled in `${SEATUNNEL_HOME}/lib/`. Add `aliyun-sdk-oss-3.4.1.jar`, `hadoop-aliyun-3.1.4.jar` and `jdom-1.1.jar` to the same directory. ## Key features diff --git a/docs/en/developer/shade-guide.md b/docs/en/developer/shade-guide.md index 21877a0e805..e39e116c339 100644 --- a/docs/en/developer/shade-guide.md +++ b/docs/en/developer/shade-guide.md @@ -21,7 +21,7 @@ For example, `seatunnel-shade-guava` shades Guava `27.0-jre` into `org.apache.se | `seatunnel-shade-commons-lang3` | Commons Lang3 | 3.18.0 | | `seatunnel-shade-arrow` | Apache Arrow | 15.0.1 | | `seatunnel-shade-hikari` | HikariCP | 4.0.3 | -| `seatunnel-shade-hazelcast` | Hazelcast | 5.1 | +| `seatunnel-shade-hazelcast` | Hazelcast | 5.1.7 | | `seatunnel-shade-hadoop3-uber` | Hadoop Client | 3.1.4 | | `seatunnel-shade-hadoop-aws` | Hadoop AWS | 3.1.4 | | `seatunnel-shade-scala-compiler` | Scala Compiler | 2.12.15 | @@ -38,10 +38,10 @@ Shade module versions follow the pattern: ${library.version}-${seatunnel.shade.version} ``` -For example: `seatunnel-shade-guava-27.0-jre-3.0.0.jar` +For example: `seatunnel-shade-guava-27.0-jre-3.0.1.jar` - `27.0-jre` is the version of the shaded library (Guava) -- `3.0.0` is the SeaTunnel shade version (controlled by the `seatunnel.shade.version` property) +- `3.0.1` is the SeaTunnel shade version (controlled by the `seatunnel.shade.version` property) ## Repository @@ -54,7 +54,7 @@ In SeaTunnel's root `pom.xml`, all shade modules are centrally managed in `<depe ```xml <properties> - <seatunnel.shade.version>3.0.0</seatunnel.shade.version> + <seatunnel.shade.version>3.0.1</seatunnel.shade.version> <seatunnel.shade.guava.version>27.0-jre</seatunnel.shade.guava.version> <seatunnel.shade.hadoop.version>3.1.4</seatunnel.shade.hadoop.version> <!-- ... other shade module versions ... --> @@ -170,7 +170,7 @@ git push origin v3.0.0.fix <parent> <groupId>org.apache.seatunnel</groupId> <artifactId>seatunnel-shade</artifactId> - <version>3.0.0</version> + <version>3.0.1</version> </parent> <artifactId>seatunnel-shade-newlib</artifactId> diff --git a/docs/en/engines/zeta/download-seatunnel.md b/docs/en/engines/zeta/download-seatunnel.md index 99fffa01e73..404d3e9a440 100644 --- a/docs/en/engines/zeta/download-seatunnel.md +++ b/docs/en/engines/zeta/download-seatunnel.md @@ -80,8 +80,10 @@ Starting from version 3.0.0, the shade modules have been moved to a separate pro | artifactId | version | Maven | |------------------------------|--------------|--------------------------------------------------------------------------------------------------------------| -| seatunnel-shade-hadoop3-uber | 3.1.4-3.0.0 | [Maven](https://repo.maven.apache.org/maven2/org/apache/seatunnel/seatunnel-shade-hadoop3-uber/3.1.4-3.0.0/seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar) | -| seatunnel-shade-hadoop-aws | 3.1.4-3.0.0 | [Maven](https://repo.maven.apache.org/maven2/org/apache/seatunnel/seatunnel-shade-hadoop-aws/3.1.4-3.0.0/seatunnel-shade-hadoop-aws-3.1.4-3.0.0.jar) | +| seatunnel-shade-hadoop3-uber | 3.1.4-3.0.1 | [Maven](https://repo.maven.apache.org/maven2/org/apache/seatunnel/seatunnel-shade-hadoop3-uber/3.1.4-3.0.1/seatunnel-shade-hadoop3-uber-3.1.4-3.0.1.jar) | +| seatunnel-shade-hadoop-aws | 3.1.4-3.0.1 | [Maven](https://repo.maven.apache.org/maven2/org/apache/seatunnel/seatunnel-shade-hadoop-aws/3.1.4-3.0.1/seatunnel-shade-hadoop-aws-3.1.4-3.0.1.jar) | + +For a standard installation, use the Hadoop Uber JAR already bundled in the SeaTunnel distribution's `lib/` directory. ### Important notes diff --git a/docs/en/engines/zeta/hybrid-cluster-deployment.md b/docs/en/engines/zeta/hybrid-cluster-deployment.md index 959087969fc..bc2a88adf6b 100644 --- a/docs/en/engines/zeta/hybrid-cluster-deployment.md +++ b/docs/en/engines/zeta/hybrid-cluster-deployment.md @@ -378,7 +378,7 @@ The provider reads `OSS_ACCESS_KEY_ID` and `OSS_ACCESS_KEY_SECRET`, plus optiona Notice: When using OSS, make sure that the following jars are in the lib directory. -The `seatunnel-shade-hadoop3-uber` JAR comes from the [Apache SeaTunnel Shade](https://github.com/apache/seatunnel-shade) project, which provides a shaded (package-relocated) version of the Hadoop client. All third-party classes are relocated under `org.apache.seatunnel.shade.*` to avoid classpath conflicts with SeaTunnel's own dependencies. The version follows the `${library.version}-${seatunnel.shade.version}` format (e.g., `3.1.4-3.0.0`). Refer to the actual JAR file name in your SeaT [...] +The `seatunnel-shade-hadoop3-uber` JAR comes from the [Apache SeaTunnel Shade](https://github.com/apache/seatunnel-shade) project, which provides a shaded (package-relocated) version of the Hadoop client. All third-party classes are relocated under `org.apache.seatunnel.shade.*` to avoid classpath conflicts with SeaTunnel's own dependencies. Use the Hadoop Uber JAR bundled in the SeaTunnel distribution's `lib/` directory. ``` aliyun-sdk-oss-3.4.1.jar @@ -386,7 +386,7 @@ hadoop-aliyun-3.1.4.jar jdom-1.1.jar netty-buffer-4.1.89.Final.jar netty-common-4.1.89.Final.jar -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar ``` It is possible to utilize S3 for IMAP storage. @@ -428,10 +428,10 @@ Both JARs come from the [Apache SeaTunnel Shade](https://github.com/apache/seatu - `seatunnel-shade-hadoop3-uber` — shaded Hadoop client with relocated packages - `seatunnel-shade-hadoop-aws` — shaded Hadoop AWS connector with relocated packages -The version follows the `${library.version}-${seatunnel.shade.version}` format (e.g., `3.1.4-3.0.0`). Refer to the actual JAR file names in your SeaTunnel distribution package for the exact version. +Use the Hadoop Uber JAR bundled in the SeaTunnel distribution's `lib/` directory. ``` -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar seatunnel-shade-hadoop-aws-${seatunnel.shade.hadoop-aws.version}-${seatunnel.shade.version}.jar ``` @@ -460,7 +460,7 @@ Notice: When using GCS, make sure that the following jars are in the lib directo ``` gcs-connector-hadoop3-2.2.33-shaded.jar -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar ``` ## 6. Configure The SeaTunnel Engine Client diff --git a/docs/en/engines/zeta/separated-cluster-deployment.md b/docs/en/engines/zeta/separated-cluster-deployment.md index f15dc526353..bc6f6109b31 100644 --- a/docs/en/engines/zeta/separated-cluster-deployment.md +++ b/docs/en/engines/zeta/separated-cluster-deployment.md @@ -330,7 +330,7 @@ The provider reads `OSS_ACCESS_KEY_ID` and `OSS_ACCESS_KEY_SECRET`, plus optiona Notice: When using OSS, make sure that the following jars are in the lib directory. -The `seatunnel-shade-hadoop3-uber` JAR comes from the [Apache SeaTunnel Shade](https://github.com/apache/seatunnel-shade) project, which provides a shaded (package-relocated) version of the Hadoop client. All third-party classes are relocated under `org.apache.seatunnel.shade.*` to avoid classpath conflicts with SeaTunnel's own dependencies. The version follows the `${library.version}-${seatunnel.shade.version}` format (e.g., `3.1.4-3.0.0`). Refer to the actual JAR file name in your SeaT [...] +The `seatunnel-shade-hadoop3-uber` JAR comes from the [Apache SeaTunnel Shade](https://github.com/apache/seatunnel-shade) project, which provides a shaded (package-relocated) version of the Hadoop client. All third-party classes are relocated under `org.apache.seatunnel.shade.*` to avoid classpath conflicts with SeaTunnel's own dependencies. Use the Hadoop Uber JAR bundled in the SeaTunnel distribution's `lib/` directory. ``` aliyun-sdk-oss-3.4.1.jar @@ -338,7 +338,7 @@ hadoop-aliyun-3.1.4.jar jdom-1.1.jar netty-buffer-4.1.89.Final.jar netty-common-4.1.89.Final.jar -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar ``` It is possible to utilize S3 for IMAP storage. @@ -379,10 +379,10 @@ Both JARs come from the [Apache SeaTunnel Shade](https://github.com/apache/seatu - `seatunnel-shade-hadoop3-uber` — shaded Hadoop client with relocated packages - `seatunnel-shade-hadoop-aws` — shaded Hadoop AWS connector with relocated packages -The version follows the `${library.version}-${seatunnel.shade.version}` format (e.g., `3.1.4-3.0.0`). Refer to the actual JAR file names in your SeaTunnel distribution package for the exact version. +Use the Hadoop Uber JAR bundled in the SeaTunnel distribution's `lib/` directory. ``` -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar seatunnel-shade-hadoop-aws-${seatunnel.shade.hadoop-aws.version}-${seatunnel.shade.version}.jar ``` @@ -411,7 +411,7 @@ Notice: When using GCS, make sure that the following jars are in the lib directo ``` gcs-connector-hadoop3-2.2.33-shaded.jar -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar ``` ### 4.7 Job Scheduling Strategy diff --git a/docs/zh/connectors/sink/Hive.md b/docs/zh/connectors/sink/Hive.md index bcb938f8575..4430753fa69 100644 --- a/docs/zh/connectors/sink/Hive.md +++ b/docs/zh/connectors/sink/Hive.md @@ -18,7 +18,7 @@ import ChangeLog from '../changelog/connector-hive.md'; 为了使用此连接器,您必须确保您的 Spark/Flink 集群已经集成了 Hive。测试过的 Hive 版本是 2.3.9 和 3.1.3。 -如果您使用 SeaTunnel 引擎,您需要将 `seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar`、`hive-exec-3.1.3.jar` 和 `libfb303-0.9.3.jar` 放在 `$SEATUNNEL_HOME/lib/` 目录中。 +如果您使用 SeaTunnel 引擎,请使用发行包自带的 `seatunnel-shade-hadoop3-uber-*.jar`,并将 `hive-exec-3.1.3.jar` 和 `libfb303-0.9.3.jar` 添加到 `$SEATUNNEL_HOME/lib/` 目录。 ::: ## 关键特性 diff --git a/docs/zh/connectors/sink/OssFile.md b/docs/zh/connectors/sink/OssFile.md index f43caf99b8c..241628f428e 100644 --- a/docs/zh/connectors/sink/OssFile.md +++ b/docs/zh/connectors/sink/OssFile.md @@ -19,7 +19,7 @@ import ChangeLog from '../changelog/connector-file-oss.md'; ### 适用于SeaTunnel Zeta引擎 -1. 您必须确保在`${SEATUNNEL_HOME}/lib/`目录中有`seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar`、`aliyun-sdk-oss-3.4.1.jar`、`hadoop-aliyun-3.1.4.jar`和`jdom-1.1.jar`。 +1. 使用发行包自带的 `seatunnel-shade-hadoop3-uber-*.jar`,并将 `aliyun-sdk-oss-3.4.1.jar`、`hadoop-aliyun-3.1.4.jar` 和 `jdom-1.1.jar` 添加到 `${SEATUNNEL_HOME}/lib/` 目录。 ## 关键特性 diff --git a/docs/zh/connectors/source/Hive.md b/docs/zh/connectors/source/Hive.md index 918ffe48521..cf7516108a1 100644 --- a/docs/zh/connectors/source/Hive.md +++ b/docs/zh/connectors/source/Hive.md @@ -18,7 +18,7 @@ import ChangeLog from '../changelog/connector-hive.md'; 为了使用此连接器,您必须确保您的 Spark/Flink 集群已经集成了 Hive。测试过的 Hive 版本是 2.3.9 和 3.1.3。 -如果您使用 SeaTunnel 引擎,您需要将 `seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar`、`hive-exec-3.1.3.jar` 和 `libfb303-0.9.3.jar` 放在 `$SEATUNNEL_HOME/lib/` 目录中。 +如果您使用 SeaTunnel 引擎,请使用发行包自带的 `seatunnel-shade-hadoop3-uber-*.jar`,并将 `hive-exec-3.1.3.jar` 和 `libfb303-0.9.3.jar` 添加到 `$SEATUNNEL_HOME/lib/` 目录。 ::: ## 关键特性 diff --git a/docs/zh/connectors/source/OssFile.md b/docs/zh/connectors/source/OssFile.md index f7c759c5447..1e11830e7e5 100644 --- a/docs/zh/connectors/source/OssFile.md +++ b/docs/zh/connectors/source/OssFile.md @@ -19,7 +19,7 @@ import ChangeLog from '../changelog/connector-file-oss.md'; ### 对于SeaTunnel Zeta引擎 -1. 您必须确保`seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar`、`aliyun-sdk-oss-3.4.1.jar`、`hadoop-aliyun-3.1.4.jar`和`jdom-1.1.jar`在`${SEATUNNEL_HOME}/lib/`目录中。 +1. 使用发行包自带的 `seatunnel-shade-hadoop3-uber-*.jar`,并将 `aliyun-sdk-oss-3.4.1.jar`、`hadoop-aliyun-3.1.4.jar` 和 `jdom-1.1.jar` 添加到 `${SEATUNNEL_HOME}/lib/` 目录。 ## 主要特性 diff --git a/docs/zh/developer/shade-guide.md b/docs/zh/developer/shade-guide.md index 60e43e85eeb..ed8caea40c2 100644 --- a/docs/zh/developer/shade-guide.md +++ b/docs/zh/developer/shade-guide.md @@ -21,7 +21,7 @@ sidebar_position: 7 | `seatunnel-shade-commons-lang3` | Commons Lang3 | 3.18.0 | | `seatunnel-shade-arrow` | Apache Arrow | 15.0.1 | | `seatunnel-shade-hikari` | HikariCP | 4.0.3 | -| `seatunnel-shade-hazelcast` | Hazelcast | 5.1 | +| `seatunnel-shade-hazelcast` | Hazelcast | 5.1.7 | | `seatunnel-shade-hadoop3-uber` | Hadoop Client | 3.1.4 | | `seatunnel-shade-hadoop-aws` | Hadoop AWS | 3.1.4 | | `seatunnel-shade-scala-compiler` | Scala Compiler | 2.12.15 | @@ -38,10 +38,10 @@ Shade 模块的版本号格式为: ${library.version}-${seatunnel.shade.version} ``` -例如:`seatunnel-shade-guava-27.0-jre-3.0.0.jar` +例如:`seatunnel-shade-guava-27.0-jre-3.0.1.jar` - `27.0-jre` 是被封装的第三方库(Guava)的版本 -- `3.0.0` 是 SeaTunnel shade 版本(由 `seatunnel.shade.version` 属性控制) +- `3.0.1` 是 SeaTunnel shade 版本(由 `seatunnel.shade.version` 属性控制) ## 仓库地址 @@ -54,7 +54,7 @@ ${library.version}-${seatunnel.shade.version} ```xml <properties> - <seatunnel.shade.version>3.0.0</seatunnel.shade.version> + <seatunnel.shade.version>3.0.1</seatunnel.shade.version> <seatunnel.shade.guava.version>27.0-jre</seatunnel.shade.guava.version> <seatunnel.shade.hadoop.version>3.1.4</seatunnel.shade.hadoop.version> <!-- ... 其他 shade 模块版本 ... --> @@ -170,7 +170,7 @@ git push origin v3.0.0.fix <parent> <groupId>org.apache.seatunnel</groupId> <artifactId>seatunnel-shade</artifactId> - <version>3.0.0</version> + <version>3.0.1</version> </parent> <artifactId>seatunnel-shade-newlib</artifactId> diff --git a/docs/zh/engines/zeta/download-seatunnel.md b/docs/zh/engines/zeta/download-seatunnel.md index e904f738d25..efaf627805a 100644 --- a/docs/zh/engines/zeta/download-seatunnel.md +++ b/docs/zh/engines/zeta/download-seatunnel.md @@ -80,8 +80,10 @@ connector-console | artifactId | version | Maven | |------------------------------| ------------ |------------------------------------------------------------------------------------------------------------| -| seatunnel-shade-hadoop3-uber | 3.1.4-3.0.0 | [Maven](https://repo.maven.apache.org/maven2/org/apache/seatunnel/seatunnel-shade-hadoop3-uber/3.1.4-3.0.0/seatunnel-shade-hadoop3-uber-3.1.4-3.0.0.jar) | -| seatunnel-shade-hadoop-aws | 3.1.4-3.0.0 | [Maven](https://repo.maven.apache.org/maven2/org/apache/seatunnel/seatunnel-shade-hadoop-aws/3.1.4-3.0.0/seatunnel-shade-hadoop-aws-3.1.4-3.0.0.jar) | +| seatunnel-shade-hadoop3-uber | 3.1.4-3.0.1 | [Maven](https://repo.maven.apache.org/maven2/org/apache/seatunnel/seatunnel-shade-hadoop3-uber/3.1.4-3.0.1/seatunnel-shade-hadoop3-uber-3.1.4-3.0.1.jar) | +| seatunnel-shade-hadoop-aws | 3.1.4-3.0.1 | [Maven](https://repo.maven.apache.org/maven2/org/apache/seatunnel/seatunnel-shade-hadoop-aws/3.1.4-3.0.1/seatunnel-shade-hadoop-aws-3.1.4-3.0.1.jar) | + +标准安装请使用 SeaTunnel 发行包 `lib/` 目录自带的 Hadoop Uber JAR。 ### 重要说明 diff --git a/docs/zh/engines/zeta/hybrid-cluster-deployment.md b/docs/zh/engines/zeta/hybrid-cluster-deployment.md index 58de25327dd..a7f49e1803c 100644 --- a/docs/zh/engines/zeta/hybrid-cluster-deployment.md +++ b/docs/zh/engines/zeta/hybrid-cluster-deployment.md @@ -373,7 +373,7 @@ map: 注意:使用OSS 时,确保 lib目录下有这几个jar。 -其中 `seatunnel-shade-hadoop3-uber` 来自 [Apache SeaTunnel Shade](https://github.com/apache/seatunnel-shade) 项目,它是对 Hadoop 客户端的 shaded(包重定位)版本,所有第三方类被重定位到 `org.apache.seatunnel.shade.*` 下,避免与 SeaTunnel 自身的依赖产生类路径冲突。版本号格式为 `${library.version}-${seatunnel.shade.version}`(例如 `3.1.4-3.0.0`),具体版本请参考 SeaTunnel 发行包中实际包含的 JAR 文件名。 +其中 `seatunnel-shade-hadoop3-uber` 来自 [Apache SeaTunnel Shade](https://github.com/apache/seatunnel-shade) 项目,它是对 Hadoop 客户端的 shaded(包重定位)版本,所有第三方类被重定位到 `org.apache.seatunnel.shade.*` 下,避免与 SeaTunnel 自身的依赖产生类路径冲突。请使用 SeaTunnel 发行包 `lib/` 目录自带的 Hadoop Uber JAR。 ``` aliyun-sdk-oss-3.4.1.jar @@ -381,7 +381,7 @@ hadoop-aliyun-3.1.4.jar jdom-1.1.jar netty-buffer-4.1.89.Final.jar netty-common-4.1.89.Final.jar -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar ``` 如果您使用 GCS,可以像这样配置: @@ -409,7 +409,7 @@ map: ``` gcs-connector-hadoop3-2.2.33-shaded.jar -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar ``` ## 6. 配置 SeaTunnel Engine 客户端 diff --git a/docs/zh/engines/zeta/separated-cluster-deployment.md b/docs/zh/engines/zeta/separated-cluster-deployment.md index e78b5f9645c..6c73029961e 100644 --- a/docs/zh/engines/zeta/separated-cluster-deployment.md +++ b/docs/zh/engines/zeta/separated-cluster-deployment.md @@ -334,7 +334,7 @@ map: 注意:使用OSS 时,确保 lib目录下有这几个jar。 -其中 `seatunnel-shade-hadoop3-uber` 来自 [Apache SeaTunnel Shade](https://github.com/apache/seatunnel-shade) 项目,它是对 Hadoop 客户端的 shaded(包重定位)版本,所有第三方类被重定位到 `org.apache.seatunnel.shade.*` 下,避免与 SeaTunnel 自身的依赖产生类路径冲突。版本号格式为 `${library.version}-${seatunnel.shade.version}`(例如 `3.1.4-3.0.0`),具体版本请参考 SeaTunnel 发行包中实际包含的 JAR 文件名。 +其中 `seatunnel-shade-hadoop3-uber` 来自 [Apache SeaTunnel Shade](https://github.com/apache/seatunnel-shade) 项目,它是对 Hadoop 客户端的 shaded(包重定位)版本,所有第三方类被重定位到 `org.apache.seatunnel.shade.*` 下,避免与 SeaTunnel 自身的依赖产生类路径冲突。请使用 SeaTunnel 发行包 `lib/` 目录自带的 Hadoop Uber JAR。 ``` aliyun-sdk-oss-3.4.1.jar @@ -342,7 +342,7 @@ hadoop-aliyun-3.1.4.jar jdom-1.1.jar netty-buffer-4.1.89.Final.jar netty-common-4.1.89.Final.jar -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar ``` 如果您使用 GCS,可以像这样配置: @@ -370,7 +370,7 @@ map: ``` gcs-connector-hadoop3-2.2.33-shaded.jar -seatunnel-shade-hadoop3-uber-${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}.jar +seatunnel-shade-hadoop3-uber-*.jar ``` ### 4.7 作业调度策略 diff --git a/pom.xml b/pom.xml index 2839a35aed3..b94099c903b 100644 --- a/pom.xml +++ b/pom.xml @@ -62,12 +62,12 @@ <revision>3.1.0-SNAPSHOT</revision> <seatunnel.config.shade.version>2.1.1</seatunnel.config.shade.version> <!-- The seatunnel shade version e.g. ${seatunnel.shade.hazelcast.version}-${seatunnel.shade.version} --> - <seatunnel.shade.version>3.0.0</seatunnel.shade.version> + <seatunnel.shade.version>3.0.1</seatunnel.shade.version> <seatunnel.shade.arraw.version>15.0.1</seatunnel.shade.arraw.version> <seatunnel.shade.guava.version>27.0-jre</seatunnel.shade.guava.version> <seatunnel.shade.hadoop.version>3.1.4</seatunnel.shade.hadoop.version> <seatunnel.shade.hadoop-aws.version>3.1.4</seatunnel.shade.hadoop-aws.version> - <seatunnel.shade.hazelcast.version>5.1</seatunnel.shade.hazelcast.version> + <seatunnel.shade.hazelcast.version>5.1.7</seatunnel.shade.hazelcast.version> <seatunnel.shade.hikari.version>4.0.3</seatunnel.shade.hikari.version> <seatunnel.shade.jackson.version>2.15.4</seatunnel.shade.jackson.version> <seatunnel.shade.janino.version>3.1.12</seatunnel.shade.janino.version> diff --git a/seatunnel-core/seatunnel-starter/pom.xml b/seatunnel-core/seatunnel-starter/pom.xml index 3789eb7d4c1..e37724977f1 100644 --- a/seatunnel-core/seatunnel-starter/pom.xml +++ b/seatunnel-core/seatunnel-starter/pom.xml @@ -137,6 +137,15 @@ <exclude>org.apache.seatunnel:seatunnel-shade-hadoop3-uber</exclude> </excludes> </artifactSet> + <filters combine.children="append"> + <filter> + <artifact>com.hazelcast:hazelcast</artifact> + <excludes> + <exclude>THIRD-PARTY.txt</exclude> + <exclude>META-INF/THIRD-PARTY.txt</exclude> + </excludes> + </filter> + </filters> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> </transformers> diff --git a/seatunnel-dist/release-docs/LICENSE b/seatunnel-dist/release-docs/LICENSE index 4172326c9aa..e7399576b0e 100644 --- a/seatunnel-dist/release-docs/LICENSE +++ b/seatunnel-dist/release-docs/LICENSE @@ -321,7 +321,7 @@ The text of each license is the standard Apache 2.0 license. (The Apache Software License, Version 2.0) protostuff (io.protostuff:protostuff-core:1.8.0 - https://github.com/protostuff/protostuff) (The Apache Software License, Version 2.0) protostuff (io.protostuff:protostuff-api:1.8.0 - https://github.com/protostuff/protostuff) (The Apache Software License, Version 2.0) protostuff (io.protostuff:protostuff-runtime:1.8.0 - https://github.com/protostuff/protostuff) - (The Apache Software License, Version 2.0) hazelcast (com.hazelcast:hazelcast:5.1 - https://github.com/hazelcast/hazelcast) + (The Apache Software License, Version 2.0) hazelcast (com.hazelcast:hazelcast:5.1.7 - https://github.com/hazelcast/hazelcast) (Apache-2.0) disruptor (com.lmax:disruptor:3.4.4 https://lmax-exchange.github.io/disruptor/) (Apache-2.0) error_prone_annotations (com.google.errorprone:error_prone_annotations:2.2.0 https://mvnrepository.com/artifact/com.google.errorprone/error_prone_annotations/2.2.0) (Apache-2.0) error_prone_annotations (com.google.errorprone:error_prone_annotations:2.18.0 https://mvnrepository.com/artifact/com.google.errorprone/error_prone_annotations/2.18.0) @@ -459,6 +459,7 @@ Public Domain License The following components are provided under the Public Domain License. See project link for details. The text of each license is also included at licenses/LICENSE-[project].txt. + (Public Domain) JSON-java (org.json:json:20230227 - https://github.com/stleary/JSON-java) (Public Domain) XZ for Java (org.tukaani:xz:1.5 - http://tukaani.org/xz/java.html) ======================================================================== diff --git a/seatunnel-dist/release-docs/licenses/LICENSE-json-java.txt b/seatunnel-dist/release-docs/licenses/LICENSE-json-java.txt new file mode 100644 index 00000000000..be3a1de7bda --- /dev/null +++ b/seatunnel-dist/release-docs/licenses/LICENSE-json-java.txt @@ -0,0 +1 @@ +Public Domain. diff --git a/seatunnel-e2e/seatunnel-resource-managers-e2e/pom.xml b/seatunnel-e2e/seatunnel-resource-managers-e2e/pom.xml index 59bb1ea5170..4f3cb4a209e 100644 --- a/seatunnel-e2e/seatunnel-resource-managers-e2e/pom.xml +++ b/seatunnel-e2e/seatunnel-resource-managers-e2e/pom.xml @@ -141,7 +141,6 @@ <artifactItem> <groupId>org.apache.seatunnel</groupId> <artifactId>seatunnel-shade-hadoop3-uber</artifactId> - <version>${seatunnel.shade.hadoop.version}-${seatunnel.shade.version}</version> <destFileName>seatunnel-shade-hadoop3-uber.jar</destFileName> </artifactItem> </artifactItems> diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index bc46686a97f..95dc908f6f7 100755 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -8,7 +8,7 @@ commons-csv-1.10.0.jar config-1.3.3.jar disruptor-3.4.4.jar guava-27.0-jre.jar -hazelcast-5.1.jar +hazelcast-5.1.7.jar httpclient-4.5.13.jar httpcore-4.4.16.jar jackson-annotations-2.15.4.jar @@ -123,16 +123,16 @@ eventstream-1.0.1.jar snakeyaml-2.1.jar sqlite-jdbc-3.39.3.0.jar jackson-datatype-jdk8-2.15.4.jar -seatunnel-shade-arrow-15.0.1-3.0.0.jar -seatunnel-shade-commons-lang3-3.18.0-3.0.0.jar -seatunnel-shade-guava-27.0-jre-3.0.0.jar -seatunnel-shade-hazelcast-5.1-3.0.0.jar -seatunnel-shade-jackson-2.15.4-3.0.0.jar -seatunnel-shade-janino-3.1.12-3.0.0.jar -seatunnel-shade-jetty-9.4.56.v20240826-3.0.0.jar -seatunnel-shade-scala-compiler-2.12-3.0.0.jar -seatunnel-shade-calcite-1.38.0-3.0.0.jar -seatunnel-shade-jackson-yaml-2.15.4-3.0.0.jar +seatunnel-shade-arrow-15.0.1-3.0.1.jar +seatunnel-shade-commons-lang3-3.18.0-3.0.1.jar +seatunnel-shade-guava-27.0-jre-3.0.1.jar +seatunnel-shade-hazelcast-5.1.7-3.0.1.jar +seatunnel-shade-jackson-2.15.4-3.0.1.jar +seatunnel-shade-janino-3.1.12-3.0.1.jar +seatunnel-shade-jetty-9.4.56.v20240826-3.0.1.jar +seatunnel-shade-scala-compiler-2.12-3.0.1.jar +seatunnel-shade-calcite-1.38.0-3.0.1.jar +seatunnel-shade-jackson-yaml-2.15.4-3.0.1.jar annotations-13.0.jar bcpkix-jdk18on-1.76.jar bcprov-jdk18on-1.76.jar
