(iceberg) branch main updated: Build: don't include slf4j-api in bundled JARs (#10665)

[bryanck]

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

bryanck pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/main by this push:
     new 048c92d43d Build: don't include slf4j-api in bundled JARs (#10665)
048c92d43d is described below

commit 048c92d43d6e1180e399ee9c68ad952310230b2b
Author: Devin Smith <devinsm...@deephaven.io>
AuthorDate: Thu Jul 11 06:47:12 2024 -0700

    Build: don't include slf4j-api in bundled JARs (#10665)
    
    This excludes `slf4j-api` from being shadowed into `iceberg-aws-bundle`, 
`iceberg-azure-bundle`, `iceberg-gcp-bundle`, and `iceberg-hive3-orc-bundle`. 
This uses the same exclude pattern established by `iceberg-bundled-guava`.
    
    Fixes #10534
---
 aws-bundle/build.gradle       | 4 ++++
 azure-bundle/build.gradle     | 4 ++++
 gcp-bundle/build.gradle       | 4 ++++
 hive3-orc-bundle/build.gradle | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/aws-bundle/build.gradle b/aws-bundle/build.gradle
index 6b1eae46d8..eea591a7b7 100644
--- a/aws-bundle/build.gradle
+++ b/aws-bundle/build.gradle
@@ -47,6 +47,10 @@ project(":iceberg-aws-bundle") {
       include 'NOTICE'
     }
 
+    dependencies {
+      exclude(dependency('org.slf4j:slf4j-api'))
+    }
+
     // relocate AWS-specific versions
     relocate 'org.apache.http', 'org.apache.iceberg.aws.shaded.org.apache.http'
     relocate 'io.netty', 'org.apache.iceberg.aws.shaded.io.netty'
diff --git a/azure-bundle/build.gradle b/azure-bundle/build.gradle
index 3bc0a31cb4..9b1cd5b42f 100644
--- a/azure-bundle/build.gradle
+++ b/azure-bundle/build.gradle
@@ -39,6 +39,10 @@ project(":iceberg-azure-bundle") {
       include 'NOTICE'
     }
 
+    dependencies {
+      exclude(dependency('org.slf4j:slf4j-api'))
+    }
+
     // relocate Azure-specific versions
     relocate 'io.netty', 'org.apache.iceberg.azure.shaded.io.netty'
     relocate 'com.fasterxml.jackson', 
'org.apache.iceberg.azure.shaded.com.fasterxml.jackson'
diff --git a/gcp-bundle/build.gradle b/gcp-bundle/build.gradle
index 98e67c214c..1b339a66c1 100644
--- a/gcp-bundle/build.gradle
+++ b/gcp-bundle/build.gradle
@@ -38,6 +38,10 @@ project(":iceberg-gcp-bundle") {
       include 'NOTICE'
     }
 
+    dependencies {
+      exclude(dependency('org.slf4j:slf4j-api'))
+    }
+
     // relocate GCP-specific versions
     relocate 'com.fasterxml.jackson', 
'org.apache.iceberg.gcp.shaded.com.fasterxml.jackson'
     relocate 'com.google.common', 
'org.apache.iceberg.gcp.shaded.com.google.common'
diff --git a/hive3-orc-bundle/build.gradle b/hive3-orc-bundle/build.gradle
index 11bb2abf85..3ca89bd474 100644
--- a/hive3-orc-bundle/build.gradle
+++ b/hive3-orc-bundle/build.gradle
@@ -50,6 +50,10 @@ project(':iceberg-hive3-orc-bundle') {
       include 'NOTICE'
     }
 
+    dependencies {
+      exclude(dependency('org.slf4j:slf4j-api'))
+    }
+
     // Relocate dependencies to avoid conflicts
     relocate 'org.apache.orc.storage', 'org.apache.hadoop.hive'