Merge Conflict Resolution (from 7.9.x to 8.0.x)#702
Merged
Hritwik Singhai (devhritwik) merged 9 commits intoMay 28, 2026
Conversation
KNET-21302: update async-http-client
…fips duplicate (#705) The cp_packaging "Build rest-utils jar" job on 7.9.x is failing with: 'dependencies.dependency.version' for org.eclipse.jetty:jetty-alpn-java-client:jar is missing. @ fips-tests/pom.xml line 50, column 21 Root cause: confluentinc/common PR #990 (9c2d2eaa22) replaced jetty-bom with explicit per-artifact entries in dependencyManagement but only added the *-server variants. The regression landed on common/7.8.x via 8bc8dba5f1 on 2026-05-14 and then propagated to common/7.9.x via the recent 7.8.x->7.9.x merge (a9c100ddbc). jetty-alpn-java-client, previously transitively managed by jetty-bom, no longer has a version. The proper fix is to add jetty-alpn-java-client to common's dependencyManagement, but to unblock the 7.9.x package build immediately, declare the version explicitly here using the inherited ${jetty.version} property. Mirrors PR #704 on 7.8.x. Also drop the leftover hardcoded bcpkix-fips 1.0.7 dependency, which has been a duplicate of the property-driven entry since the 7.7.x->7.8.x merge in Sep 2024 and propagated down through 7.9.x. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Truc Nguyen (trnguyencflt)
approved these changes
May 21, 2026
Truc Nguyen (trnguyencflt)
approved these changes
May 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What is this pull request?
This is an autogenerated pull request by
pintdue to a merge conflict failure seen duringpint merge.Next Steps
pint mergeNOTE: "Create a merge commit" option must be used to ensure all commits from the head branch is added to the base branch.
Questions?
Please reach out to the Developer Productivity team on Slack at #devprod-eng or #devprod-oncall