(gravitino) branch branch-0.7 updated: [#5444] fix(gcp): relocate GCP bundle jar to avoid conflict with Gravitino (#5462)

[jshao]

This is an automated email from the ASF dual-hosted git repository.

jshao pushed a commit to branch branch-0.7
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/branch-0.7 by this push:
     new ebe820c98 [#5444] fix(gcp): relocate GCP bundle jar to avoid conflict 
with Gravitino (#5462)
ebe820c98 is described below

commit ebe820c9837c8bdc1074661c18c212ce5c9c083c
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Nov 5 17:28:56 2024 +0800

    [#5444] fix(gcp): relocate GCP bundle jar to avoid conflict with Gravitino 
(#5462)
    
    ### What changes were proposed in this pull request?
    
    shade `gcp` package to `org.apache.gravitino.gcp.shaded` to avoid
    conflict with the shaded package in Gravitino.
    
    ### Why are the changes needed?
    
    The faster XML package in GCP bundle jar is conflict with the package in
    Gravitino java client runtime.
    
    Fix: #5444
    
    
    ### Does this PR introduce _any_ user-facing change?
    no
    
    ### How was this patch tested?
    
    run a app to use GCP bundle to do fileset operations.
    
    Co-authored-by: FANNG <xiaoj...@datastrato.com>
---
 bundles/gcp-bundle/build.gradle.kts                               | 8 ++++----
 .../resources/META-INF/services/org.apache.hadoop.fs.FileSystem   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/gcp-bundle/build.gradle.kts 
b/bundles/gcp-bundle/build.gradle.kts
index 14488ec27..7d679f627 100644
--- a/bundles/gcp-bundle/build.gradle.kts
+++ b/bundles/gcp-bundle/build.gradle.kts
@@ -49,10 +49,10 @@ tasks.withType(ShadowJar::class.java) {
   archiveClassifier.set("")
 
   // Relocate dependencies to avoid conflicts
-  relocate("org.apache.httpcomponents", 
"org.apache.gravitino.shaded.org.apache.httpcomponents")
-  relocate("org.apache.commons", 
"org.apache.gravitino.shaded.org.apache.commons")
-  relocate("com.google", "org.apache.gravitino.shaded.com.google")
-  relocate("com.fasterxml", "org.apache.gravitino.shaded.com.fasterxml")
+  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", "org.apache.gravitino.gcp.shaded.com.google")
+  relocate("com.fasterxml", "org.apache.gravitino.gcp.shaded.com.fasterxml")
 }
 
 tasks.jar {
diff --git 
a/bundles/gcp-bundle/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
 
b/bundles/gcp-bundle/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
index e67410de7..751c6f653 100644
--- 
a/bundles/gcp-bundle/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
+++ 
b/bundles/gcp-bundle/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
@@ -17,4 +17,4 @@
 # under the License.
 #
 
-org.apache.gravitino.shaded.com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystem
+org.apache.gravitino.gcp.shaded.com.google.cloud.hadoop.fs.gcs.GoogleHadoopFileSystem