CherryPick: Fix Iceberg hadoopIO dep failure

[ahmedabu98]

CP for #38500

---

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)

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

[ahmedabu98]

R: @Amar3tto

[gemini-code-assist]

Summary of Changes

Hello, I'm Gemini Code Assist¹! 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 addresses dependency conflicts related to Hadoop versions within the Iceberg IO and expansion service modules. By pinning Hadoop to version 3.3.6, the changes ensure compatibility between conflicting libraries while maintaining stability. Additionally, the PR includes minor code refactoring to improve dependency isolation and updates test triggers to verify the fix.

Highlights

• Dependency Management: Pinned Hadoop dependencies to version 3.3.6 in expansion-service and Iceberg IO modules to resolve version conflicts between gcs-connector and parquet-hadoop.
• Code Cleanup: Updated IcebergScanConfig to use the vendored Guava library for set operations instead of the Hadoop-provided utility.
• Integration Tests: Updated trigger files for Iceberg integration tests to ensure test suites are executed.

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]

Code Review

This pull request pins Hadoop dependencies to version 3.3.6 in the Iceberg and expansion-service modules to resolve version conflicts between gcs-connector and parquet-hadoop. It also updates an import in IcebergScanConfig to use vendor-shaded Guava and adds a necessary runtime dependency. Feedback focuses on improving maintainability by centralizing the Hadoop version variable and maintaining consistency in how dependencies are referenced in the build files.

[gemini-code-assist]

The dependency hadoop-common is hardcoded to version 3.3.6 here, while hadoop_client on line 74 continues to use the library.java catalog. Since resolutionStrategy.force is applied later in this file (lines 125-128) to ensure version 3.3.6 is used across all configurations, it is more consistent and maintainable to keep using the library catalog here.

    implementation library.java.hadoop_common

[gemini-code-assist]

This block of version pinning and the accompanying comment are duplicated in sdks/java/io/iceberg/build.gradle. To improve maintainability and ensure that this temporary override is managed in one place, consider defining the Hadoop version as a variable in a central location (e.g., BeamModulePlugin or a project-level property) and referencing it in both files.

[github-actions]

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

[Abacn]

We also need to cherry-pick #38488 (opened #38503)