Skip to content

Commit

Permalink
[#6363] improvment(bundle-gcp): Shade some GCP IAM classes in `gcp-bu…
Browse files Browse the repository at this point in the history
…ndles` 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.
  • Loading branch information
yuqi1129 authored Jan 26, 2025
1 parent ab85969 commit 578adde
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions bundles/gcp-bundle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down

0 comments on commit 578adde

Please sign in to comment.