(beam) branch master updated: Exclude slf4j from arrow dependencies (#30306)

[yhu]

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

yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new abd77bc2551 Exclude slf4j from arrow dependencies (#30306)
abd77bc2551 is described below

commit abd77bc25515bbaf9e2660a03daa574cb93be79f
Author: Yi Hu <ya...@google.com>
AuthorDate: Thu Feb 15 09:51:17 2024 -0500

    Exclude slf4j from arrow dependencies (#30306)
---
 sdks/java/extensions/arrow/build.gradle         | 15 ++++++++++++---
 sdks/java/io/google-cloud-platform/build.gradle | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/sdks/java/extensions/arrow/build.gradle 
b/sdks/java/extensions/arrow/build.gradle
index 6ce5bff9656..33c62a6ace2 100644
--- a/sdks/java/extensions/arrow/build.gradle
+++ b/sdks/java/extensions/arrow/build.gradle
@@ -24,10 +24,19 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: 
Arrow"
 dependencies {
     implementation library.java.vendored_guava_32_1_2_jre
     implementation project(path: ":sdks:java:core", configuration: "shadow")
-    implementation library.java.arrow_vector
-    implementation library.java.arrow_memory_core
+    implementation(library.java.arrow_vector) {
+        // Arrow 15 has compile dependency of slf4j 2.x where Beam does not 
support
+        exclude group: 'org.slf4j', module: 'slf4j-api'
+    }
+    implementation(library.java.arrow_memory_core) {
+        // Arrow 15 has compile dependency of slf4j 2.x where Beam does not 
support
+        exclude group: 'org.slf4j', module: 'slf4j-api'
+    }
     implementation library.java.joda_time
-    testImplementation library.java.arrow_memory_netty
+    testImplementation(library.java.arrow_memory_netty) {
+        // Arrow 15 has compile dependency of slf4j 2.x where Beam does not 
support
+        exclude group: 'org.slf4j', module: 'slf4j-api'
+    }
     testImplementation library.java.junit
     testImplementation library.java.hamcrest
     testRuntimeOnly library.java.slf4j_simple
diff --git a/sdks/java/io/google-cloud-platform/build.gradle 
b/sdks/java/io/google-cloud-platform/build.gradle
index 723cf94f528..f025f9e8039 100644
--- a/sdks/java/io/google-cloud-platform/build.gradle
+++ b/sdks/java/io/google-cloud-platform/build.gradle
@@ -144,13 +144,22 @@ dependencies {
   implementation library.java.slf4j_api
   implementation library.java.vendored_grpc_1_60_1
   implementation library.java.vendored_guava_32_1_2_jre
-  implementation library.java.arrow_memory_core
-  implementation library.java.arrow_vector
+  implementation(library.java.arrow_memory_core) {
+    // Arrow 15 has compile dependency of slf4j 2.x where Beam does not support
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
+  implementation(library.java.arrow_vector) {
+    // Arrow 15 has compile dependency of slf4j 2.x where Beam does not support
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
 
   implementation 'com.google.http-client:google-http-client-gson:1.41.2'
   implementation "org.threeten:threetenbp:1.4.4"
 
-  testImplementation library.java.arrow_memory_netty
+  testImplementation(library.java.arrow_memory_netty) {
+    // Arrow 15 has compile dependency of slf4j 2.x where Beam does not support
+    exclude group: 'org.slf4j', module: 'slf4j-api'
+  }
   testImplementation project(path: ":sdks:java:core", configuration: 
"shadowTest")
   testImplementation project(path: ":sdks:java:extensions:avro", 
configuration: "testRuntimeMigration")
   testImplementation project(path: 
":sdks:java:extensions:google-cloud-platform-core", configuration: 
"testRuntimeMigration")