Skip to content

Commit

Permalink
[#5444] fix(gcp): relocate GCP bundle jar to avoid conflict with Grav…
Browse files Browse the repository at this point in the history
…itino (#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 <[email protected]>
  • Loading branch information
github-actions[bot] and FANNG1 authored Nov 5, 2024
1 parent a2dd37b commit ebe820c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions bundles/gcp-bundle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ebe820c

Please sign in to comment.