(gravitino) branch main updated: [#6049] fix(bundles): Fix scheme gs not found problem (#6050)

[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 6f6343038 [#6049] fix(bundles): Fix scheme gs not found problem (#6050)
6f6343038 is described below

commit 6f6343038bab3dde69f6f9a519ee997a2fd6cb88
Author: Qi Yu <y...@datastrato.com>
AuthorDate: Fri Jan 3 16:27:04 2025 +0800

    [#6049] fix(bundles): Fix scheme gs not found problem (#6050)
    
    ### What changes were proposed in this pull request?
    
    Add `mergeServiceFiles()` when build the bundle jars
    
    
    ### Why are the changes needed?
    
    After add HDFS client to gravitino bundle jar, we should add make sure
    both Gravitino and HDFS `Filesystem` are merged into resource file
    
    Fix: #6049
    
    ### Does this PR introduce _any_ user-facing change?
    
    N/A
    
    ### How was this patch tested?
    
    Existing test.
    
    ---------
    
    Co-authored-by: Jerry Shao <jerrys...@datastrato.com>
---
 .github/workflows/backend-integration-test.yml | 1 +
 bundles/aws-bundle/build.gradle.kts            | 1 +
 bundles/azure-bundle/build.gradle.kts          | 1 +
 bundles/gcp-bundle/build.gradle.kts            | 1 +
 4 files changed, 4 insertions(+)

diff --git a/.github/workflows/backend-integration-test.yml 
b/.github/workflows/backend-integration-test.yml
index 1958163f8..085c508ad 100644
--- a/.github/workflows/backend-integration-test.yml
+++ b/.github/workflows/backend-integration-test.yml
@@ -39,6 +39,7 @@ jobs:
               - meta/**
               - scripts/**
               - server/**
+              - bundles/**
               - server-common/**
               - build.gradle.kts
               - gradle.properties
diff --git a/bundles/aws-bundle/build.gradle.kts 
b/bundles/aws-bundle/build.gradle.kts
index 35b1e22a4..a5765fb06 100644
--- a/bundles/aws-bundle/build.gradle.kts
+++ b/bundles/aws-bundle/build.gradle.kts
@@ -39,6 +39,7 @@ tasks.withType(ShadowJar::class.java) {
   relocate("org.apache.commons.lang3", 
"org.apache.gravitino.aws.shaded.org.apache.commons.lang3")
   relocate("com.google.common", 
"org.apache.gravitino.aws.shaded.com.google.common")
   relocate("com.fasterxml.jackson", 
"org.apache.gravitino.aws.shaded.com.fasterxml.jackson")
+  mergeServiceFiles()
 }
 
 tasks.jar {
diff --git a/bundles/azure-bundle/build.gradle.kts 
b/bundles/azure-bundle/build.gradle.kts
index 7d9e253ac..fd57d33e1 100644
--- a/bundles/azure-bundle/build.gradle.kts
+++ b/bundles/azure-bundle/build.gradle.kts
@@ -42,6 +42,7 @@ tasks.withType(ShadowJar::class.java) {
   relocate("com.fasterxml", "org.apache.gravitino.azure.shaded.com.fasterxml")
   relocate("com.google.common", 
"org.apache.gravitino.azure.shaded.com.google.common")
   relocate("org.eclipse.jetty", 
"org.apache.gravitino.azure.shaded.org.eclipse.jetty")
+  mergeServiceFiles()
 }
 
 tasks.jar {
diff --git a/bundles/gcp-bundle/build.gradle.kts 
b/bundles/gcp-bundle/build.gradle.kts
index 73efaf9f2..50300fafe 100644
--- a/bundles/gcp-bundle/build.gradle.kts
+++ b/bundles/gcp-bundle/build.gradle.kts
@@ -42,6 +42,7 @@ tasks.withType(ShadowJar::class.java) {
   relocate("com.google.common", 
"org.apache.gravitino.gcp.shaded.com.google.common")
   relocate("com.fasterxml", "org.apache.gravitino.gcp.shaded.com.fasterxml")
   relocate("org.eclipse.jetty", 
"org.apache.gravitino.gcp.shaded.org.eclipse.jetty")
+  mergeServiceFiles()
 }
 
 tasks.jar {