(gravitino) branch branch-1.3 updated: [Cherry-pick to branch-1.3] [#11604] fix(bundle): Include Gravitino credential providers in Iceberg cloud bundles (#11616) (#11660)

[mchades]

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

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


The following commit(s) were added to refs/heads/branch-1.3 by this push:
     new 79176d4dc1 [Cherry-pick to branch-1.3] [#11604] fix(bundle): Include 
Gravitino credential providers in Iceberg cloud bundles (#11616) (#11660)
79176d4dc1 is described below

commit 79176d4dc17401507b4c6d6a1f70e70fea05b161
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 16 11:23:33 2026 +0800

    [Cherry-pick to branch-1.3] [#11604] fix(bundle): Include Gravitino 
credential providers in Iceberg cloud bundles (#11616) (#11660)
    
    **Cherry-pick Information:**
    - Original commit: 51765bca89dcb90645a70126d2a1f6ae51d8c4a5
    - Target branch: `branch-1.3`
    - Status: ✅ Clean cherry-pick (no conflicts)
    
    Co-authored-by: Yuhui <h...@datastrato.com>
---
 bundles/iceberg-aliyun-bundle/build.gradle.kts | 7 +++++++
 bundles/iceberg-aws-bundle/build.gradle.kts    | 7 +++++++
 bundles/iceberg-azure-bundle/build.gradle.kts  | 9 +++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/bundles/iceberg-aliyun-bundle/build.gradle.kts 
b/bundles/iceberg-aliyun-bundle/build.gradle.kts
index 0492861ad2..829bf18bc0 100644
--- a/bundles/iceberg-aliyun-bundle/build.gradle.kts
+++ b/bundles/iceberg-aliyun-bundle/build.gradle.kts
@@ -30,6 +30,8 @@ dependencies {
   // Aliyun oss SDK depends on this package, and JDK >= 9 requires manual add
   // 
https://www.alibabacloud.com/help/en/oss/developer-reference/java-installation?spm=a2c63.p38356.0.i1
   implementation(libs.sun.activation)
+  // Include Gravitino Aliyun credential providers (OSSSecretKeyProvider, 
etc.) for credential vending
+  implementation(project(":bundles:aliyun"))
 }
 
 tasks.withType(ShadowJar::class.java) {
@@ -39,6 +41,11 @@ tasks.withType(ShadowJar::class.java) {
 
   dependencies {
     exclude(dependency("org.slf4j:slf4j-api"))
+    // Exclude Gravitino modules to prevent class duplication with server 
classpath
+    exclude(project(":api"))
+    exclude(project(":common"))
+    exclude(project(":catalogs:catalog-common"))
+    exclude(project(":catalogs:hadoop-common"))
   }
 
   mergeServiceFiles()
diff --git a/bundles/iceberg-aws-bundle/build.gradle.kts 
b/bundles/iceberg-aws-bundle/build.gradle.kts
index 10074b96e7..4eaf9c536c 100644
--- a/bundles/iceberg-aws-bundle/build.gradle.kts
+++ b/bundles/iceberg-aws-bundle/build.gradle.kts
@@ -30,6 +30,8 @@ dependencies {
     exclude("*")
   }
   implementation(libs.iceberg.aws.bundle)
+  // Include Gravitino AWS credential providers (S3SecretKeyProvider, etc.) 
for credential vending
+  implementation(project(":bundles:aws"))
 }
 
 tasks.withType(ShadowJar::class.java) {
@@ -39,6 +41,11 @@ tasks.withType(ShadowJar::class.java) {
 
   dependencies {
     exclude(dependency("org.slf4j:slf4j-api"))
+    // Exclude Gravitino modules to prevent class duplication with server 
classpath
+    exclude(project(":api"))
+    exclude(project(":common"))
+    exclude(project(":catalogs:catalog-common"))
+    exclude(project(":catalogs:hadoop-common"))
   }
 
   // Iceberg AWS bundle includes Log4j (before 1.10.1), so exclude to avoid 
conflicts
diff --git a/bundles/iceberg-azure-bundle/build.gradle.kts 
b/bundles/iceberg-azure-bundle/build.gradle.kts
index 26092c1a45..ea44cb35d1 100644
--- a/bundles/iceberg-azure-bundle/build.gradle.kts
+++ b/bundles/iceberg-azure-bundle/build.gradle.kts
@@ -30,9 +30,9 @@ configurations.shadow {
 }
 
 dependencies {
-  // The iceberg-azure-bundle already includes the dependencies
-  // required by Gravitino for credential vending.
   implementation(libs.iceberg.azure.bundle)
+  // Include Gravitino Azure credential providers (AzureAccountKeyProvider, 
etc.) for credential vending
+  implementation(project(":bundles:azure"))
 }
 
 tasks.withType(ShadowJar::class.java) {
@@ -42,6 +42,11 @@ tasks.withType(ShadowJar::class.java) {
 
   dependencies {
     exclude(dependency("org.slf4j:slf4j-api"))
+    // Exclude Gravitino modules to prevent class duplication with server 
classpath
+    exclude(project(":api"))
+    exclude(project(":common"))
+    exclude(project(":catalogs:catalog-common"))
+    exclude(project(":catalogs:hadoop-common"))
   }
 
   mergeServiceFiles()