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 7873931341 [#7745] fix(fs-bundles): avoid shade jdk class (#7940)
7873931341 is described below
commit 78739313419b91ead502d74bf3e67c752d00fe97
Author: mchades <[email protected]>
AuthorDate: Thu Aug 7 14:28:13 2025 +0800
[#7745] fix(fs-bundles): avoid shade jdk class (#7940)
### What changes were proposed in this pull request?
remove shade "com.sun" to avoid shade jdk class in bundle jar
### Why are the changes needed?
Fix: #7745
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
test locally
---
bundles/aliyun-bundle/build.gradle.kts | 5 ++++-
bundles/aliyun/build.gradle.kts | 5 ++++-
bundles/azure-bundle/build.gradle.kts | 3 ++-
bundles/azure/build.gradle.kts | 3 ++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/bundles/aliyun-bundle/build.gradle.kts
b/bundles/aliyun-bundle/build.gradle.kts
index eb4b955d78..588bbdf14f 100644
--- a/bundles/aliyun-bundle/build.gradle.kts
+++ b/bundles/aliyun-bundle/build.gradle.kts
@@ -46,7 +46,10 @@ tasks.withType(ShadowJar::class.java) {
// Relocate dependencies to avoid conflicts
relocate("com.fasterxml.jackson",
"org.apache.gravitino.aliyun.shaded.com.fasterxml.jackson")
relocate("com.google", "org.apache.gravitino.aliyun.shaded.com.google")
- relocate("com.sun", "org.apache.gravitino.aliyun.shaded.com.sun")
+ relocate("com.sun.activation",
"org.apache.gravitino.aliyun.shaded.com.sun.activation")
+ relocate("com.sun.istack",
"org.apache.gravitino.aliyun.shaded.com.sun.istack")
+ relocate("com.sun.jersey",
"org.apache.gravitino.aliyun.shaded.com.sun.jersey")
+ relocate("com.sun.xml", "org.apache.gravitino.aliyun.shaded.com.sun.xml")
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")
diff --git a/bundles/aliyun/build.gradle.kts b/bundles/aliyun/build.gradle.kts
index 93d63361ef..ccf4378f9c 100644
--- a/bundles/aliyun/build.gradle.kts
+++ b/bundles/aliyun/build.gradle.kts
@@ -82,7 +82,10 @@ tasks.withType(ShadowJar::class.java) {
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",
"org.apache.gravitino.aliyun.shaded.com.google.common")
- relocate("com.sun", "org.apache.gravitino.aliyun.shaded.com.sun")
+ relocate("com.sun.activation",
"org.apache.gravitino.aliyun.shaded.com.sun.activation")
+ relocate("com.sun.istack",
"org.apache.gravitino.aliyun.shaded.com.sun.istack")
+ relocate("com.sun.jersey",
"org.apache.gravitino.aliyun.shaded.com.sun.jersey")
+ relocate("com.sun.xml", "org.apache.gravitino.aliyun.shaded.com.sun.xml")
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")
diff --git a/bundles/azure-bundle/build.gradle.kts
b/bundles/azure-bundle/build.gradle.kts
index 9d26b4817b..088b01a407 100644
--- a/bundles/azure-bundle/build.gradle.kts
+++ b/bundles/azure-bundle/build.gradle.kts
@@ -46,7 +46,8 @@ tasks.withType(ShadowJar::class.java) {
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("com.sun.jna", "org.apache.gravitino.azure.shaded.com.sun.jna")
+ relocate("com.sun.xml", "org.apache.gravitino.azure.shaded.com.sun.xml")
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")
diff --git a/bundles/azure/build.gradle.kts b/bundles/azure/build.gradle.kts
index 5befae1467..b03138628a 100644
--- a/bundles/azure/build.gradle.kts
+++ b/bundles/azure/build.gradle.kts
@@ -70,7 +70,8 @@ tasks.withType(ShadowJar::class.java) {
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("com.sun.jna", "org.apache.gravitino.azure.shaded.com.sun.jna")
+ relocate("com.sun.xml", "org.apache.gravitino.azure.shaded.com.sun.xml")
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")
