Skip to content

Fix CdapIO dependency#39393

Merged
Abacn merged 1 commit into
apache:masterfrom
Abacn:fix-cdap-dep
Jul 21, 2026
Merged

Fix CdapIO dependency#39393
Abacn merged 1 commit into
apache:masterfrom
Abacn:fix-cdap-dep

Conversation

@Abacn

@Abacn Abacn commented Jul 20, 2026

Copy link
Copy Markdown
Contributor
  • Add resolveCapabilitiesConflict

  • Bump cdap-api to 6.11.4

Please add a meaningful description for your change here

Follow up #39284


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

* Add resolveCapabilitiesConflict

* Bump cdap-api to 6.11.4
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request updates the CDAP dependency version to 6.11.4 and introduces a configuration change to resolve dependency conflicts related to the lz4 library within the CDAP IO module. These changes ensure compatibility and stability for the CDAP connector.

Highlights

  • Dependency Update: Updated the CDAP API version from 6.5.1 to 6.11.4 in the Beam module plugin.
  • Dependency Conflict Resolution: Added a capability conflict resolution for 'org.lz4:lz4-java' in the CDAP IO build configuration to address conflicts with Kafka clients.
New Features

🧠 You can now enable Memory (public preview) to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the CDAP version to 6.11.4 and adds a configuration block to resolve a capabilities conflict in the CDAP Java IO SDK. The review feedback correctly identifies that the module notation for 'at.yawk.lz4' is incomplete because it lacks the artifact ID, and suggests correcting it to 'at.yawk.lz4:lz4-java' to ensure proper conflict resolution.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.


// 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')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The module notation 'at.yawk.lz4' is incomplete as it only specifies the group ID. It should include the artifact ID as well, which is 'at.yawk.lz4:lz4-java'. Passing an incomplete module notation will prevent the capability conflict resolution helper from correctly identifying and resolving the conflict.

    resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4:lz4-java')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this technically could help, but is unnecessary -

def candidate = candidates.find { it.id.toString().contains(preferred) }

@github-actions

Copy link
Copy Markdown
Contributor

Assigning reviewers:

R: @chamikaramj for label java.
R: @damccorm for label build.

Note: If you would like to opt out of this review, comment assign to next reviewer.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@damccorm damccorm left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Abacn
Abacn merged commit dca1253 into apache:master Jul 21, 2026
25 checks passed
@Abacn
Abacn deleted the fix-cdap-dep branch July 21, 2026 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants