(gravitino) branch main updated: [#6363] improvment(bundle-gcp): Shade some GCP IAM classes in `gcp-bundles` to avoid possible conflict (#6364)

[fanng]

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

fanng 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 578adde28 [#6363] improvment(bundle-gcp): Shade some GCP IAM classes 
in `gcp-bundles` to avoid possible conflict (#6364)
578adde28 is described below

commit 578adde2868308763fe1ba2d28fbd0b87160f957
Author: Qi Yu <y...@datastrato.com>
AuthorDate: Sun Jan 26 15:12:52 2025 +0800

    [#6363] improvment(bundle-gcp): Shade some GCP IAM classes in `gcp-bundles` 
to avoid possible conflict (#6364)
    
    ### What changes were proposed in this pull request?
    
    Shade some GCP, gcp and probobuf classes to avoid conflicts with GCP IAM
    classes.
    
    ### Why are the changes needed?
    
    To avoid possible class conflicts.
    
    Fix: #6363
    
    ### Does this PR introduce _any_ user-facing change?
    
    N/A.
    
    ### How was this patch tested?
    
    existing UTs and ITs.
---
 bundles/gcp-bundle/build.gradle.kts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/bundles/gcp-bundle/build.gradle.kts 
b/bundles/gcp-bundle/build.gradle.kts
index 50300fafe..067ecf7b3 100644
--- a/bundles/gcp-bundle/build.gradle.kts
+++ b/bundles/gcp-bundle/build.gradle.kts
@@ -37,10 +37,17 @@ tasks.withType(ShadowJar::class.java) {
   archiveClassifier.set("")
 
   // 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.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.common", 
"org.apache.gravitino.gcp.shaded.com.google.common")
+  relocate("com.google.iam", "org.apache.gravitino.gcp.shaded.com.google.iam")
+  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("io.grpc", "org.apache.gravitino.gcp.shaded.io.grpc")
+
+  relocate("org.apache.commons", 
"org.apache.gravitino.gcp.shaded.org.apache.commons")
+  relocate("org.apache.httpcomponents", 
"org.apache.gravitino.gcp.shaded.org.apache.httpcomponents")
   relocate("org.eclipse.jetty", 
"org.apache.gravitino.gcp.shaded.org.eclipse.jetty")
   mergeServiceFiles()
 }