This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch branch-1.0
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-1.0 by this push:
new 5b770925be [#8041][#8337][#8353] fix (server): Fix class conflicts in
the AWS bundle JARs and other bundle JARs. (#8448)
5b770925be is described below
commit 5b770925be6acf59b114cc1dea9783b3c3daf7e5
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Sep 5 14:14:54 2025 +0800
[#8041][#8337][#8353] fix (server): Fix class conflicts in the AWS bundle
JARs and other bundle JARs. (#8448)
### What changes were proposed in this pull request?
Fix class conflicts in the AWS bundle JARs and other bundle JARs
### Why are the changes needed?
Fix: #8041
Fix: #8337
Fix: #8353
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Manually test
Co-authored-by: Yuhui <[email protected]>
Co-authored-by: fanng <[email protected]>
Co-authored-by: Jerry Shao <[email protected]>
---
bundles/aliyun/build.gradle.kts | 5 ++---
bundles/aws/build.gradle.kts | 10 ++--------
bundles/azure/build.gradle.kts | 5 ++---
bundles/gcp/build.gradle.kts | 5 ++---
catalogs/catalog-common/build.gradle.kts | 5 ++++-
gradle/libs.versions.toml | 2 +-
6 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/bundles/aliyun/build.gradle.kts b/bundles/aliyun/build.gradle.kts
index a79aa1ce04..c84dfc8184 100644
--- a/bundles/aliyun/build.gradle.kts
+++ b/bundles/aliyun/build.gradle.kts
@@ -29,10 +29,8 @@ dependencies {
compileOnly(libs.hadoop3.client.api)
compileOnly(libs.hadoop3.client.runtime)
compileOnly(libs.hadoop3.oss)
+ compileOnly(project(":common"))
- implementation(project(":common")) {
- exclude("*")
- }
implementation(project(":catalogs:catalog-common")) {
exclude("*")
}
@@ -63,6 +61,7 @@ dependencies {
testImplementation(project(":api"))
testImplementation(project(":core"))
+ testImplementation(project(":common"))
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testRuntimeOnly(libs.junit.jupiter.engine)
diff --git a/bundles/aws/build.gradle.kts b/bundles/aws/build.gradle.kts
index b506847643..1bc4c55adb 100644
--- a/bundles/aws/build.gradle.kts
+++ b/bundles/aws/build.gradle.kts
@@ -29,10 +29,8 @@ dependencies {
compileOnly(libs.hadoop3.aws)
compileOnly(libs.hadoop3.client.api)
compileOnly(libs.hadoop3.client.runtime)
+ compileOnly(project(":common"))
- implementation(project(":common")) {
- exclude("*")
- }
implementation(project(":catalogs:catalog-common")) {
exclude("*")
}
@@ -44,11 +42,11 @@ dependencies {
implementation(libs.aws.policy)
implementation(libs.aws.sts)
implementation(libs.commons.lang3)
- implementation(libs.hadoop3.aws)
implementation(libs.guava)
testImplementation(project(":api"))
testImplementation(project(":core"))
+ testImplementation(project(":common"))
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testRuntimeOnly(libs.junit.jupiter.engine)
@@ -63,14 +61,10 @@ tasks.withType(ShadowJar::class.java) {
exclude(dependency("org.slf4j:slf4j-api"))
}
- relocate("com.amazonaws", "org.apache.gravitino.aws.shaded.com.amazonaws")
- relocate("com.fasterxml.jackson",
"org.apache.gravitino.aws.shaded.com.fasterxml.jackson")
relocate("com.google.common",
"org.apache.gravitino.aws.shaded.com.google.common")
relocate("com.google.errorprone",
"org.apache.gravitino.aws.shaded.com.google.errorprone")
relocate("com.google.thirdparty",
"org.apache.gravitino.aws.shaded.com.google.thirdparty")
- relocate("io.netty", "org.apache.gravitino.aws.shaded.io.netty")
relocate("org.apache.commons",
"org.apache.gravitino.aws.shaded.org.apache.commons")
- relocate("org.apache.hadoop.fs.s3a",
"org.apache.gravitino.aws.shaded.org.apache.hadoop.fs.s3a")
relocate("org.apache.http",
"org.apache.gravitino.aws.shaded.org.apache.http")
relocate("org.checkerframework",
"org.apache.gravitino.aws.shaded.org.checkerframework")
relocate("org.reactivestreams",
"org.apache.gravitino.aws.shaded.org.reactivestreams")
diff --git a/bundles/azure/build.gradle.kts b/bundles/azure/build.gradle.kts
index 2bc0e1fa4c..a11df2ed00 100644
--- a/bundles/azure/build.gradle.kts
+++ b/bundles/azure/build.gradle.kts
@@ -29,10 +29,8 @@ dependencies {
compileOnly(libs.hadoop3.abs)
compileOnly(libs.hadoop3.client.api)
compileOnly(libs.hadoop3.client.runtime)
+ compileOnly(project(":common"))
- implementation(project(":common")) {
- exclude("*")
- }
implementation(project(":catalogs:catalog-common")) {
exclude("*")
}
@@ -50,6 +48,7 @@ dependencies {
testImplementation(project(":api"))
testImplementation(project(":core"))
+ testImplementation(project(":common"))
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testRuntimeOnly(libs.junit.jupiter.engine)
diff --git a/bundles/gcp/build.gradle.kts b/bundles/gcp/build.gradle.kts
index b7a78fcd84..4be8d0a154 100644
--- a/bundles/gcp/build.gradle.kts
+++ b/bundles/gcp/build.gradle.kts
@@ -29,10 +29,8 @@ dependencies {
compileOnly(libs.hadoop3.client.api)
compileOnly(libs.hadoop3.client.runtime)
compileOnly(libs.hadoop3.gcs)
+ compileOnly(project(":common"))
- implementation(project(":common")) {
- exclude("*")
- }
implementation(project(":catalogs:catalog-common")) {
exclude("*")
}
@@ -47,6 +45,7 @@ dependencies {
testImplementation(project(":api"))
testImplementation(project(":core"))
+ testImplementation(project(":common"))
testImplementation(libs.junit.jupiter.api)
testImplementation(libs.junit.jupiter.params)
testRuntimeOnly(libs.junit.jupiter.engine)
diff --git a/catalogs/catalog-common/build.gradle.kts
b/catalogs/catalog-common/build.gradle.kts
index ff9451728d..6bbac8e068 100644
--- a/catalogs/catalog-common/build.gradle.kts
+++ b/catalogs/catalog-common/build.gradle.kts
@@ -23,7 +23,10 @@ plugins {
// try to avoid adding extra dependencies because it is used by catalogs and
connectors.
dependencies {
- implementation(project(":common"))
+ implementation(project(":common")) {
+ exclude("*")
+ }
+
implementation(libs.commons.lang3)
implementation(libs.guava)
implementation(libs.jakarta.validation.api)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 04d25e82fc..0c76685fba 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@
# under the License.
#
[versions]
-awssdk = "2.28.3"
+awssdk = "2.29.52"
azure-identity = "1.13.1"
azure-storage-file-datalake = "12.20.0"
reactor-netty-http = "1.2.1"
