Skip to content

Commit

Permalink
[opt](mvn) remove iceberg-aws-bundle and upgrade aws sdk to 2.29.26 (#…
Browse files Browse the repository at this point in the history
…47117)

### What problem does this PR solve?

1. No need to depend on iceberg-aws-bundle, because we've already
declare the depends we need separately.
2. upgrade aws sdk to 2.29.26 to prepare for s3 tables
  • Loading branch information
morningman authored Jan 17, 2025
1 parent 3a3814a commit b796837
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
10 changes: 2 additions & 8 deletions fe/fe-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ under the License.
<doris.home>${basedir}/../../</doris.home>
<doris.thirdparty>${basedir}/../../thirdparty</doris.thirdparty>
<fe_ut_parallel>1</fe_ut_parallel>
<awssdk.version>2.20.131</awssdk.version>
<huaweiobs.version>3.1.1-hw-46</huaweiobs.version>
<tencentcos.version>8.2.7</tencentcos.version>
</properties>
Expand Down Expand Up @@ -496,10 +495,10 @@ under the License.
<artifactId>s3</artifactId>
<version>${awssdk.version}</version>
<exclusions>
<exclusion>
<!--exclusion>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache-client</artifactId>
</exclusion>
</exclusion-->
</exclusions>
</dependency>
<!-- tencent cloud sts -->
Expand Down Expand Up @@ -654,11 +653,6 @@ under the License.
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-aws</artifactId>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-aws-bundle</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-core</artifactId>
Expand Down
6 changes: 1 addition & 5 deletions fe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ under the License.
<azure.sdk.batch.version>12.22.0</azure.sdk.batch.version>
<semver4j.version>5.3.0</semver4j.version>
<aliyun-sdk-oss.version>3.15.0</aliyun-sdk-oss.version>
<awssdk.version>2.29.26</awssdk.version>
</properties>
<profiles>
<profile>
Expand Down Expand Up @@ -1308,11 +1309,6 @@ under the License.
<artifactId>iceberg-aws</artifactId>
<version>${iceberg.version}</version>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-aws-bundle</artifactId>
<version>${iceberg.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun.odps</groupId>
<artifactId>odps-sdk-core</artifactId>
Expand Down

0 comments on commit b796837

Please sign in to comment.