This is an automated email from the ASF dual-hosted git repository.
FrankChen021 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new ae8b1b2df9f build(deps-dev): bump com.aliyun.oss:aliyun-sdk-oss from
3.11.3 to 3.18.5 (#20048)
ae8b1b2df9f is described below
commit ae8b1b2df9f682dc1098c38d8053be7bb4b567e6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 20 09:41:12 2026 +0800
build(deps-dev): bump com.aliyun.oss:aliyun-sdk-oss from 3.11.3 to 3.18.5
(#20048)
* build(deps-dev): bump com.aliyun.oss:aliyun-sdk-oss
Bumps
[com.aliyun.oss:aliyun-sdk-oss](https://github.com/aliyun/aliyun-oss-java-sdk)
from 3.11.3 to 3.18.5.
- [Release notes](https://github.com/aliyun/aliyun-oss-java-sdk/releases)
-
[Commits](https://github.com/aliyun/aliyun-oss-java-sdk/compare/3.11.3...3.18.5)
---
updated-dependencies:
- dependency-name: com.aliyun.oss:aliyun-sdk-oss
dependency-version: 3.18.5
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* fix(deps): align Aliyun OSS SDK dependencies
* fix(deps): allow Aliyun OSS Javadocs on JDK 25
* fix(deps): resolve Aliyun OSS Javadocs on JDK 25
* fix(deps): keep Aliyun OSS assembly non-modular
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frank Chen <[email protected]>
---
embedded-tests/pom.xml | 2 +-
extensions-contrib/aliyun-oss-extensions/pom.xml | 29 ++++++++++++---
.../src/assembly/jar-with-dependencies.xml | 43 ++++++++++++++++++++++
.../storage/aliyun/OssDataSegmentMoverTest.java | 4 +-
4 files changed, 71 insertions(+), 7 deletions(-)
diff --git a/embedded-tests/pom.xml b/embedded-tests/pom.xml
index 6f26edc21fa..f1e0b33b5a1 100644
--- a/embedded-tests/pom.xml
+++ b/embedded-tests/pom.xml
@@ -777,7 +777,7 @@
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
- <version>3.11.3</version>
+ <version>3.18.5</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/extensions-contrib/aliyun-oss-extensions/pom.xml
b/extensions-contrib/aliyun-oss-extensions/pom.xml
index 8dd9c1b112e..2021399daae 100644
--- a/extensions-contrib/aliyun-oss-extensions/pom.xml
+++ b/extensions-contrib/aliyun-oss-extensions/pom.xml
@@ -31,6 +31,16 @@
<version>39.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.reactivestreams</groupId>
+ <artifactId>reactive-streams</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
@@ -57,7 +67,7 @@
<dependency> <!-- aliyun oss -->
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
- <version>3.11.3</version>
+ <version>3.18.5</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
@@ -65,7 +75,6 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-guice</artifactId>
@@ -149,9 +158,9 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
+ <descriptors>
+
<descriptor>src/assembly/jar-with-dependencies.xml</descriptor>
+ </descriptors>
<archive><!--add entries like Implementation-Title to
MANIFEST.MF-->
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -175,6 +184,16 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalOptions>
+
<additionalOption>--add-modules=jdk.incubator.vector,java.compiler</additionalOption>
+
<additionalOption>--add-reads=java.xml.bind=ALL-UNNAMED,java.compiler</additionalOption>
+ </additionalOptions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git
a/extensions-contrib/aliyun-oss-extensions/src/assembly/jar-with-dependencies.xml
b/extensions-contrib/aliyun-oss-extensions/src/assembly/jar-with-dependencies.xml
new file mode 100644
index 00000000000..cc948baea0a
--- /dev/null
+++
b/extensions-contrib/aliyun-oss-extensions/src/assembly/jar-with-dependencies.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0
http://maven.apache.org/xsd/assembly-2.1.0.xsd";>
+ <id>jar-with-dependencies</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <unpackOptions>
+ <excludes>
+ <exclude>module-info.class</exclude>
+ <exclude>META-INF/versions/9/module-info.class</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>
diff --git
a/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentMoverTest.java
b/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentMoverTest.java
index 9165771f10c..6e9a72af280 100644
---
a/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentMoverTest.java
+++
b/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentMoverTest.java
@@ -28,6 +28,7 @@ import com.aliyun.oss.model.OSSObjectSummary;
import com.aliyun.oss.model.ObjectListing;
import com.aliyun.oss.model.PutObjectResult;
import com.aliyun.oss.model.StorageClass;
+import com.aliyun.oss.model.VoidResult;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -252,10 +253,11 @@ public class OssDataSegmentMoverTest
}
@Override
- public void deleteObject(String bucket, String objectKey)
+ public VoidResult deleteObject(String bucket, String objectKey)
{
deletedOld = true;
storage.get(bucket).remove(objectKey);
+ return new VoidResult();
}
public PutObjectResult putObject(String bucketName, String key)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
