This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 8d20c48ddf [#7279] improvement(GVFS): shade GVFS dependency jars
(#7298)
8d20c48ddf is described below
commit 8d20c48ddf96e9099100acfd750ce224b79f01a5
Author: mchades <[email protected]>
AuthorDate: Wed Jul 2 15:08:48 2025 +0800
[#7279] improvement(GVFS): shade GVFS dependency jars (#7298)
### What changes were proposed in this pull request?
shade gcp provider dependencies jar
### Why are the changes needed?
Fix: #7279
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
CI pass
---------
Co-authored-by: Jerry Shao <[email protected]>
---
bundles/aliyun-bundle/build.gradle.kts | 14 +++++++++----
bundles/aliyun/build.gradle.kts | 15 ++++++++++----
bundles/aws-bundle/build.gradle.kts | 16 ++++++++++++---
bundles/aws/build.gradle.kts | 16 +++++++++++++--
bundles/azure-bundle/build.gradle.kts | 19 ++++++++++++++---
bundles/azure/build.gradle.kts | 21 ++++++++++++++++---
bundles/gcp-bundle/build.gradle.kts | 13 ++++++++----
bundles/gcp/build.gradle.kts | 24 ++++++++++++++++++----
clients/client-java-runtime/build.gradle.kts | 2 ++
.../filesystem-hadoop3-runtime/build.gradle.kts | 2 ++
10 files changed, 115 insertions(+), 27 deletions(-)
diff --git a/bundles/aliyun-bundle/build.gradle.kts
b/bundles/aliyun-bundle/build.gradle.kts
index 6d3409e37e..eb4b955d78 100644
--- a/bundles/aliyun-bundle/build.gradle.kts
+++ b/bundles/aliyun-bundle/build.gradle.kts
@@ -44,12 +44,18 @@ tasks.withType(ShadowJar::class.java) {
}
// Relocate dependencies to avoid conflicts
- relocate("org.jdom", "org.apache.gravitino.aliyun.shaded.org.jdom")
- relocate("org.apache.commons.lang3",
"org.apache.gravitino.aliyun.shaded.org.apache.commons.lang3")
relocate("com.fasterxml.jackson",
"org.apache.gravitino.aliyun.shaded.com.fasterxml.jackson")
- relocate("com.google.common",
"org.apache.gravitino.aliyun.shaded.com.google.common")
+ relocate("com.google", "org.apache.gravitino.aliyun.shaded.com.google")
+ relocate("com.sun", "org.apache.gravitino.aliyun.shaded.com.sun")
+ relocate("okhttp3", "org.apache.gravitino.aliyun.shaded.okhttp3")
+ relocate("okio", "org.apache.gravitino.aliyun.shaded.okio")
+ relocate("org.apache.commons",
"org.apache.gravitino.aliyun.shaded.org.apache.commons")
relocate("org.apache.http",
"org.apache.gravitino.aliyun.shaded.org.apache.http")
- relocate("org.apache.commons.collections",
"org.apache.gravitino.aliyun.shaded.org.apache.commons.collections")
+ relocate("org.checkerframework",
"org.apache.gravitino.aliyun.shaded.org.checkerframework")
+ relocate("org.jacoco.agent.rt",
"org.apache.gravitino.aliyun.shaded.org.jacoco.agent.rt")
+ relocate("org.jdom", "org.apache.gravitino.aliyun.shaded.org.jdom")
+
+ mergeServiceFiles()
}
tasks.jar {
diff --git a/bundles/aliyun/build.gradle.kts b/bundles/aliyun/build.gradle.kts
index 910b490644..93d63361ef 100644
--- a/bundles/aliyun/build.gradle.kts
+++ b/bundles/aliyun/build.gradle.kts
@@ -79,12 +79,19 @@ tasks.withType(ShadowJar::class.java) {
}
// Relocate dependencies to avoid conflicts
- relocate("org.jdom", "org.apache.gravitino.aliyun.shaded.org.jdom")
- relocate("org.apache.commons.lang3",
"org.apache.gravitino.aliyun.shaded.org.apache.commons.lang3")
+ relocate("com.aliyun", "org.apache.gravitino.aliyun.shaded.com.aliyun")
relocate("com.fasterxml.jackson",
"org.apache.gravitino.aliyun.shaded.com.fasterxml.jackson")
- relocate("com.google.common",
"org.apache.gravitino.aliyun.shaded.com.google.common")
+ relocate("com.google",
"org.apache.gravitino.aliyun.shaded.com.google.common")
+ relocate("com.sun", "org.apache.gravitino.aliyun.shaded.com.sun")
+ relocate("okhttp3", "org.apache.gravitino.aliyun.shaded.okhttp3")
+ relocate("okio", "org.apache.gravitino.aliyun.shaded.okio")
+ relocate("org.apache.commons",
"org.apache.gravitino.aliyun.shaded.org.apache.commons")
relocate("org.apache.http",
"org.apache.gravitino.aliyun.shaded.org.apache.http")
- relocate("org.apache.commons.collections",
"org.apache.gravitino.aliyun.shaded.org.apache.commons.collections")
+ relocate("org.checkerframework",
"org.apache.gravitino.aliyun.shaded.org.checkerframework")
+ relocate("org.jacoco.agent.rt",
"org.apache.gravitino.aliyun.shaded.org.jacoco.agent.rt")
+ relocate("org.jdom", "org.apache.gravitino.aliyun.shaded.org.jdom")
+
+ mergeServiceFiles()
}
tasks.jar {
diff --git a/bundles/aws-bundle/build.gradle.kts
b/bundles/aws-bundle/build.gradle.kts
index e5ae68fb38..4495b16d5c 100644
--- a/bundles/aws-bundle/build.gradle.kts
+++ b/bundles/aws-bundle/build.gradle.kts
@@ -11,7 +11,8 @@
*
* 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
+ * "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.
@@ -40,9 +41,18 @@ tasks.withType(ShadowJar::class.java) {
exclude(dependency("org.slf4j:slf4j-api"))
}
- relocate("org.apache.commons.lang3",
"org.apache.gravitino.aws.shaded.org.apache.commons.lang3")
- relocate("com.google.common",
"org.apache.gravitino.aws.shaded.com.google.common")
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.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")
+ relocate("org.wildfly.openssl",
"org.apache.gravitino.aws.shaded.org.wildfly.openssl")
+ relocate("software.amazon",
"org.apache.gravitino.aws.shaded.software.amazon")
+
mergeServiceFiles()
}
diff --git a/bundles/aws/build.gradle.kts b/bundles/aws/build.gradle.kts
index c452782532..c284839b01 100644
--- a/bundles/aws/build.gradle.kts
+++ b/bundles/aws/build.gradle.kts
@@ -63,9 +63,21 @@ tasks.withType(ShadowJar::class.java) {
exclude(dependency("org.slf4j:slf4j-api"))
}
- relocate("org.apache.commons.lang3",
"org.apache.gravitino.aws.shaded.org.apache.commons.lang3")
- relocate("com.google.common",
"org.apache.gravitino.aws.shaded.com.google.common")
+ 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")
+ relocate("org.wildfly.openssl",
"org.apache.gravitino.aws.shaded.org.wildfly.openssl")
+ relocate("software.amazon",
"org.apache.gravitino.aws.shaded.software.amazon")
+
+ mergeServiceFiles()
}
tasks.jar {
diff --git a/bundles/azure-bundle/build.gradle.kts
b/bundles/azure-bundle/build.gradle.kts
index 5681716c58..9d26b4817b 100644
--- a/bundles/azure-bundle/build.gradle.kts
+++ b/bundles/azure-bundle/build.gradle.kts
@@ -41,11 +41,24 @@ tasks.withType(ShadowJar::class.java) {
}
// Relocate dependencies to avoid conflicts
- relocate("org.apache.httpcomponents",
"org.apache.gravitino.azure.shaded.org.apache.httpcomponents")
- relocate("org.apache.commons",
"org.apache.gravitino.azure.shaded.org.apache.commons")
+ relocate("com.ctc.wstx", "org.apache.gravitino.azure.shaded.com.ctc.wstx")
relocate("com.fasterxml", "org.apache.gravitino.azure.shaded.com.fasterxml")
- relocate("com.google.common",
"org.apache.gravitino.azure.shaded.com.google.common")
+ relocate("com.google", "org.apache.gravitino.azure.shaded.com.google")
+ relocate("com.microsoft.aad",
"org.apache.gravitino.azure.shaded.com.microsoft.aad")
+ relocate("com.nimbusds", "org.apache.gravitino.azure.shaded.com.nimbusds")
+ relocate("com.sun", "org.apache.gravitino.azure.shaded.com.sun")
+ relocate("io.netty", "org.apache.gravitino.azure.shaded.io.netty")
+ relocate("net.minidev", "org.apache.gravitino.azure.shaded.net.minidev")
+ relocate("net.jcip.annotations",
"org.apache.gravitino.azure.shaded.net.jcip.annotations")
+ relocate("org.apache.commons",
"org.apache.gravitino.azure.shaded.org.apache.commons")
+ relocate("org.apache.httpcomponents",
"org.apache.gravitino.azure.shaded.org.apache.httpcomponents")
+ relocate("org.checkerframework",
"org.apache.gravitino.azure.shaded.org.checkerframework")
+ relocate("org.codehaus.stax2",
"org.apache.gravitino.azure.shaded.org.codehaus.stax2")
relocate("org.eclipse.jetty",
"org.apache.gravitino.azure.shaded.org.eclipse.jetty")
+ relocate("org.objectweb.asm",
"org.apache.gravitino.azure.shaded.org.objectweb.asm")
+ relocate("org.reactivestreams",
"org.apache.gravitino.azure.shaded.org.reactivestreams")
+ relocate("reactor", "org.apache.gravitino.azure.shaded.reactor")
+
mergeServiceFiles()
}
diff --git a/bundles/azure/build.gradle.kts b/bundles/azure/build.gradle.kts
index 9364cdc783..5befae1467 100644
--- a/bundles/azure/build.gradle.kts
+++ b/bundles/azure/build.gradle.kts
@@ -64,11 +64,26 @@ tasks.withType(ShadowJar::class.java) {
}
// Relocate dependencies to avoid conflicts
- relocate("org.apache.httpcomponents",
"org.apache.gravitino.azure.shaded.org.apache.httpcomponents")
- relocate("org.apache.commons",
"org.apache.gravitino.azure.shaded.org.apache.commons")
+ relocate("com.azure", "org.apache.gravitino.azure.shaded.com.azure")
+ relocate("com.ctc.wstx", "org.apache.gravitino.azure.shaded.com.ctc.wstx")
relocate("com.fasterxml", "org.apache.gravitino.azure.shaded.com.fasterxml")
- relocate("com.google.common",
"org.apache.gravitino.azure.shaded.com.google.common")
+ relocate("com.google", "org.apache.gravitino.azure.shaded.com.google.common")
+ relocate("com.microsoft.aad",
"org.apache.gravitino.azure.shaded.com.microsoft.aad")
+ relocate("com.nimbusds", "org.apache.gravitino.azure.shaded.com.nimbusds")
+ relocate("com.sun", "org.apache.gravitino.azure.shaded.com.sun")
+ relocate("io.netty", "org.apache.gravitino.azure.shaded.io.netty")
+ relocate("net.minidev", "org.apache.gravitino.azure.shaded.net.minidev")
+ relocate("net.jcip.annotations",
"org.apache.gravitino.azure.shaded.net.jcip.annotations")
+ relocate("org.apache.commons",
"org.apache.gravitino.azure.shaded.org.apache.commons")
+ relocate("org.apache.httpcomponents",
"org.apache.gravitino.azure.shaded.org.apache.httpcomponents")
+ relocate("org.checkerframework",
"org.apache.gravitino.azure.shaded.org.checkerframework")
+ relocate("org.codehaus.stax2",
"org.apache.gravitino.azure.shaded.org.codehaus.stax2")
relocate("org.eclipse.jetty",
"org.apache.gravitino.azure.shaded.org.eclipse.jetty")
+ relocate("org.objectweb.asm",
"org.apache.gravitino.azure.shaded.org.objectweb.asm")
+ relocate("org.reactivestreams",
"org.apache.gravitino.azure.shaded.org.reactivestreams")
+ relocate("reactor", "org.apache.gravitino.azure.shaded.reactor")
+
+ mergeServiceFiles()
}
tasks.jar {
diff --git a/bundles/gcp-bundle/build.gradle.kts
b/bundles/gcp-bundle/build.gradle.kts
index dcbb990d61..1f0fc7ec23 100644
--- a/bundles/gcp-bundle/build.gradle.kts
+++ b/bundles/gcp-bundle/build.gradle.kts
@@ -42,17 +42,22 @@ tasks.withType(ShadowJar::class.java) {
// Relocate dependencies to avoid conflicts
relocate("com.fasterxml", "org.apache.gravitino.gcp.shaded.com.fasterxml")
- relocate("com.google.api", "org.apache.gravitino.gcp.shaded.com.google.api")
- relocate("com.google.auth",
"org.apache.gravitino.gcp.shaded.com.google.auth")
+ relocate("com.google.auto",
"org.apache.gravitino.gcp.shaded.com.google.auto")
relocate("com.google.common",
"org.apache.gravitino.gcp.shaded.com.google.common")
- relocate("com.google.iam", "org.apache.gravitino.gcp.shaded.com.google.iam")
+ relocate("com.google.errorprone",
"org.apache.gravitino.gcp.shaded.com.google.errorprone")
+ relocate("com.google.gson",
"org.apache.gravitino.gcp.shaded.com.google.gson")
+ relocate("com.google.j2objc",
"org.apache.gravitino.gcp.shaded.com.google.j2objc")
relocate("com.google.longrunning",
"org.apache.gravitino.gcp.shaded.com.google.longrunning")
relocate("com.google.protobuf",
"org.apache.gravitino.gcp.shaded.com.google.protobuf")
+ relocate("com.google.thirdparty",
"org.apache.gravitino.gcp.shaded.com.google.thirdparty")
relocate("io.grpc", "org.apache.gravitino.gcp.shaded.io.grpc")
-
+ relocate("io.opencensus", "org.apache.gravitino.gcp.shaded.io.opencensus")
relocate("org.apache.commons",
"org.apache.gravitino.gcp.shaded.org.apache.commons")
+ relocate("org.apache.http",
"org.apache.gravitino.gcp.shaded.org.apache.http")
relocate("org.apache.httpcomponents",
"org.apache.gravitino.gcp.shaded.org.apache.httpcomponents")
+ relocate("org.checkerframework",
"org.apache.gravitino.gcp.shaded.org.checkerframework")
relocate("org.eclipse.jetty",
"org.apache.gravitino.gcp.shaded.org.eclipse.jetty")
+
mergeServiceFiles()
}
diff --git a/bundles/gcp/build.gradle.kts b/bundles/gcp/build.gradle.kts
index a15890864d..61001ccab5 100644
--- a/bundles/gcp/build.gradle.kts
+++ b/bundles/gcp/build.gradle.kts
@@ -63,11 +63,27 @@ tasks.withType(ShadowJar::class.java) {
}
// Relocate dependencies to avoid conflicts
- relocate("org.apache.httpcomponents",
"org.apache.gravitino.gcp.shaded.org.apache.httpcomponents")
- relocate("org.apache.commons",
"org.apache.gravitino.gcp.shaded.org.apache.commons")
- relocate("com.google.common",
"org.apache.gravitino.gcp.shaded.com.google.common")
relocate("com.fasterxml", "org.apache.gravitino.gcp.shaded.com.fasterxml")
- relocate("com.fasterxml.jackson",
"org.apache.gravitino.gcp.shaded.com.fasterxml.jackson")
+ relocate("com.google.api", "org.apache.gravitino.gcp.shaded.com.google.api")
+ relocate("com.google.auth",
"org.apache.gravitino.gcp.shaded.com.google.auth")
+ relocate("com.google.auto",
"org.apache.gravitino.gcp.shaded.com.google.auto")
+ relocate("com.google.common",
"org.apache.gravitino.gcp.shaded.com.google.common")
+ relocate("com.google.errorprone",
"org.apache.gravitino.gcp.shaded.com.google.errorprone")
+ relocate("com.google.gson",
"org.apache.gravitino.gcp.shaded.com.google.gson")
+ relocate("com.google.iam", "org.apache.gravitino.gcp.shaded.com.google.iam")
+ relocate("com.google.j2objc",
"org.apache.gravitino.gcp.shaded.com.google.j2objc")
+ relocate("com.google.longrunning",
"org.apache.gravitino.gcp.shaded.com.google.longrunning")
+ relocate("com.google.protobuf",
"org.apache.gravitino.gcp.shaded.com.google.protobuf")
+ relocate("com.google.thirdparty",
"org.apache.gravitino.gcp.shaded.com.google.thirdparty")
+ relocate("io.grpc", "org.apache.gravitino.gcp.shaded.io.grpc")
+ relocate("io.opencensus", "org.apache.gravitino.gcp.shaded.io.opencensus")
+ relocate("org.apache.commons",
"org.apache.gravitino.gcp.shaded.org.apache.commons")
+ relocate("org.apache.http",
"org.apache.gravitino.gcp.shaded.org.apache.http")
+ relocate("org.apache.httpcomponents",
"org.apache.gravitino.gcp.shaded.org.apache.httpcomponents")
+ relocate("org.checkerframework",
"org.apache.gravitino.gcp.shaded.org.checkerframework")
+ relocate("org.eclipse.jetty",
"org.apache.gravitino.gcp.shaded.org.eclipse.jetty")
+
+ mergeServiceFiles()
}
tasks.jar {
diff --git a/clients/client-java-runtime/build.gradle.kts
b/clients/client-java-runtime/build.gradle.kts
index f3747adb81..01ca47724e 100644
--- a/clients/client-java-runtime/build.gradle.kts
+++ b/clients/client-java-runtime/build.gradle.kts
@@ -47,6 +47,8 @@ tasks.withType<ShadowJar>(ShadowJar::class.java) {
relocate("org.apache.httpcomponents",
"org.apache.gravitino.shaded.org.apache.httpcomponents")
relocate("org.apache.commons",
"org.apache.gravitino.shaded.org.apache.commons")
relocate("org.antlr", "org.apache.gravitino.shaded.org.antlr")
+
+ mergeServiceFiles()
}
tasks.jar {
diff --git a/clients/filesystem-hadoop3-runtime/build.gradle.kts
b/clients/filesystem-hadoop3-runtime/build.gradle.kts
index 021c246cc4..6a98d621e5 100644
--- a/clients/filesystem-hadoop3-runtime/build.gradle.kts
+++ b/clients/filesystem-hadoop3-runtime/build.gradle.kts
@@ -43,6 +43,8 @@ tasks.withType<ShadowJar>(ShadowJar::class.java) {
relocate("com.github.benmanes.caffeine",
"org.apache.gravitino.shaded.com.github.benmanes.caffeine")
// relocate common lang3 package
relocate("org.apache.commons.lang3",
"org.apache.gravitino.shaded.org.apache.commons.lang3")
+ relocate("org.apache.hc", "org.apache.gravitino.shaded.org.apache.hc")
+ relocate("org.checkerframework",
"org.apache.gravitino.shaded.org.checkerframework")
mergeServiceFiles()
}
