From d47e2b2afda57a437e4e92c069565dd8c99551d4 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Thu, 5 Jun 2025 11:32:40 -0400 Subject: [PATCH 1/2] Fix IntelliJ sync project failure due to circular Beam dependency --- examples/java/cdap/hubspot/build.gradle | 10 ++++++++-- examples/java/cdap/salesforce/build.gradle | 9 +++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/examples/java/cdap/hubspot/build.gradle b/examples/java/cdap/hubspot/build.gradle index 8f560c73cf96..af4a4bcf67ba 100644 --- a/examples/java/cdap/hubspot/build.gradle +++ b/examples/java/cdap/hubspot/build.gradle @@ -69,9 +69,15 @@ dependencies { implementation library.java.cdap_hydrator_common //TODO: modify to 'implementation library.java.cdap_plugin_hubspot', // when new release with HasOffset interface will be published - implementation "com.akvelon:cdap-hubspot-plugins:1.1.0" + implementation("com.akvelon:cdap-hubspot-plugins:1.1.0") { + // circular dependency to Beam component + exclude group: "org.apache.beam", module: "beam-sdks-java-io-sparkreceiver" + } + // implementation project(":sdks:java:io:sparkreceiver:3") + implementation library.java.spark3_streaming + permitUnusedDeclared library.java.spark3_streaming implementation library.java.google_code_gson - implementation library.java.hadoop_common + implementation "org.apache.hadoop:hadoop-client-api:3.3.4" implementation library.java.slf4j_api implementation library.java.vendored_guava_32_1_2_jre runtimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/examples/java/cdap/salesforce/build.gradle b/examples/java/cdap/salesforce/build.gradle index 1abe19d6403b..a6fc344e0008 100644 --- a/examples/java/cdap/salesforce/build.gradle +++ b/examples/java/cdap/salesforce/build.gradle @@ -65,9 +65,14 @@ dependencies { implementation library.java.cdap_hydrator_common //TODO: modify to 'implementation library.java.cdap_plugin_salesforce', // when new release with HasOffset interface will be published - implementation "com.akvelon:cdap-salesforce-plugins:1.5.1" + implementation("com.akvelon:cdap-salesforce-plugins:1.5.1") { + // circular dependency to Beam component + exclude group: "org.apache.beam", module: "beam-sdks-java-io-sparkreceiver" + } + implementation library.java.spark3_streaming + permitUnusedDeclared library.java.spark3_streaming implementation library.java.google_code_gson - implementation library.java.hadoop_common + implementation "org.apache.hadoop:hadoop-client-api:3.3.4" implementation library.java.slf4j_api implementation library.java.vendored_guava_32_1_2_jre runtimeOnly project(path: ":runners:direct-java", configuration: "shadow") From 26a8efa4f30e5089c8caf11ba756ff91ef0ee5f2 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Fri, 6 Jun 2025 09:38:57 -0400 Subject: [PATCH 2/2] address comments --- examples/java/cdap/hubspot/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/java/cdap/hubspot/build.gradle b/examples/java/cdap/hubspot/build.gradle index af4a4bcf67ba..94ff682aa2ee 100644 --- a/examples/java/cdap/hubspot/build.gradle +++ b/examples/java/cdap/hubspot/build.gradle @@ -73,7 +73,6 @@ dependencies { // circular dependency to Beam component exclude group: "org.apache.beam", module: "beam-sdks-java-io-sparkreceiver" } - // implementation project(":sdks:java:io:sparkreceiver:3") implementation library.java.spark3_streaming permitUnusedDeclared library.java.spark3_streaming implementation library.java.google_code_gson