You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by lz...@apache.org on 2022/08/05 03:25:26 UTC
[flink] branch master updated: [FLINK-28801][oss] Bump OSS SDK to 3.13.2
This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new d9e6721ac72 [FLINK-28801][oss] Bump OSS SDK to 3.13.2
d9e6721ac72 is described below
commit d9e6721ac724409b2d4276374959db89287e90c5
Author: Jinhu Wu <wu...@126.com>
AuthorDate: Fri Aug 5 11:25:17 2022 +0800
[FLINK-28801][oss] Bump OSS SDK to 3.13.2
This closes #20450
---
flink-filesystems/flink-oss-fs-hadoop/pom.xml | 17 ++++++++++++++++-
.../src/main/resources/META-INF/NOTICE | 19 +++++++++++++------
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/flink-filesystems/flink-oss-fs-hadoop/pom.xml b/flink-filesystems/flink-oss-fs-hadoop/pom.xml
index 2190afb3500..7d66bf2dd6f 100644
--- a/flink-filesystems/flink-oss-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-oss-fs-hadoop/pom.xml
@@ -29,7 +29,7 @@ under the License.
<name>Flink : FileSystems : OSS FS</name>
<properties>
- <fs.oss.sdk.version>3.4.1</fs.oss.sdk.version>
+ <fs.oss.sdk.version>3.13.2</fs.oss.sdk.version>
</properties>
<dependencies>
@@ -73,6 +73,21 @@ under the License.
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>${fs.oss.sdk.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <!-- Hadoop requires jaxb-api for javax.xml.bind.JAXBException -->
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.api.version}</version>
+ <!-- packaged as an optional dependency that is only accessible on Java 11+ -->
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE
index c1948c84d03..169f22ec473 100644
--- a/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE
+++ b/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/NOTICE
@@ -6,11 +6,10 @@ 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.aliyun.oss:aliyun-sdk-oss:3.4.1
-- com.aliyun:aliyun-java-sdk-core:3.4.0
-- com.aliyun:aliyun-java-sdk-ecs:4.2.0
-- com.aliyun:aliyun-java-sdk-ram:3.0.0
-- com.aliyun:aliyun-java-sdk-sts:3.0.0
+- com.aliyun.oss:aliyun-sdk-oss:3.13.2
+- com.aliyun:aliyun-java-sdk-core:4.5.10
+- com.aliyun:aliyun-java-sdk-ram:3.1.0
+- com.aliyun:aliyun-java-sdk-kms:2.11.0
- commons-codec:commons-codec:1.15
- commons-logging:commons-logging:1.1.3
- org.apache.hadoop:hadoop-aliyun:3.3.2
@@ -18,8 +17,16 @@ This project bundles the following dependencies under the Apache Software Licens
- org.apache.httpcomponents:httpcore:4.4.14
- org.codehaus.jettison:jettison:1.1
- stax:stax-api:1.0.1
+- com.google.code.gson:gson:2.8.6
+- org.ini4j:ini4j:0.5.4
+- io.opentracing:opentracing-api:0.33.0
+- io.opentracing:opentracing-util:0.33.0
+- io.opentracing:opentracing-noop:0.33.0
+
+The binary distribution of this product bundles these dependencies under the Eclipse Public License - v 2.0 (https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt)
+- org.jacoco:org.jacoco.agent:runtime:0.8.5
This project bundles the following dependencies under the JDOM license.
See bundled license files for details.
-- org.jdom:jdom:1.1
+- org.jdom:jdom2:2.0.6