(beam) branch master updated: Fix CdapIO dependency (#39393)

[yhu]

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

Abacn 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 dca1253c7e3 Fix CdapIO dependency (#39393)
dca1253c7e3 is described below

commit dca1253c7e3886d125c526aa830b7945daef16ce
Author: Yi Hu <ya...@google.com>
AuthorDate: Tue Jul 21 09:47:05 2026 -0400

    Fix CdapIO dependency (#39393)
---
 .../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy   | 2 +-
 sdks/java/io/cdap/build.gradle                                       | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy 
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index d73f2e7a2ba..70a22e39772 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -613,7 +613,7 @@ class BeamModulePlugin implements Plugin<Project> {
     def autoservice_version = "1.0.1"
     def aws_java_sdk2_version = "2.20.162"
     def cassandra_driver_version = "3.10.2"
-    def cdap_version = "6.5.1"
+    def cdap_version = "6.11.4"
     def checkerframework_version = "3.42.0"
     def classgraph_version = "4.8.162"
     def delta_lake_version = "4.2.0"
diff --git a/sdks/java/io/cdap/build.gradle b/sdks/java/io/cdap/build.gradle
index e0af1717e16..cc7e3ba12cd 100644
--- a/sdks/java/io/cdap/build.gradle
+++ b/sdks/java/io/cdap/build.gradle
@@ -90,3 +90,8 @@ test {
     // Open java.lang for Gson reflection on StackTraceElement under Java 17+
     jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
 }
+
+// spark3_streaming depends on old 'org.lz4:lz4-java'; conflict with 
kafka-clients:3.9.2
+configurations.all {
+    resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
+}
\ No newline at end of file