Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not merge in parent dependency where child overrides the version or scope #4434

Merged
merged 9 commits into from
Aug 22, 2024
Merged

Do not merge in parent dependency where child overrides the version or scope #4434

merged 9 commits into from
Aug 22, 2024

Conversation

Laurens-W
Copy link
Contributor

What's changed?

What's your motivation?

Anything in particular you'd like reviewers to focus on?

Anyone you would like to review specifically?

Have you considered any alternatives or workarounds?

Any additional context

Checklist

  • I've added unit tests to cover both positive and negative cases
  • I've read and applied the recipe conventions and best practices
  • I've used the IntelliJ IDEA auto-formatter on affected files

@Laurens-W Laurens-W added the bug Something isn't working label Aug 21, 2024
@Laurens-W Laurens-W self-assigned this Aug 21, 2024
@Laurens-W Laurens-W changed the title AddDependency should remove dependency from child pom when it overrides parent scope Dependency that is overriden by child should not be included in MavenResolutionResult Aug 22, 2024
@timtebeek timtebeek changed the title Dependency that is overriden by child should not be included in MavenResolutionResult Correctly scope child dependencies when a parent dependency scope is overwritten Aug 22, 2024
@timtebeek timtebeek self-requested a review August 22, 2024 10:00
@timtebeek timtebeek marked this pull request as ready for review August 22, 2024 10:15
@timtebeek timtebeek changed the title Correctly scope child dependencies when a parent dependency scope is overwritten Do not merge in parent dependency where child overrides the version or scope Aug 22, 2024
timtebeek
timtebeek approved these changes Aug 22, 2024
View reviewed changes
Copy link
Contributor

@timtebeek timtebeek left a comment

Choose a reason for hiding this comment

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

Approved after applying these two suggestions; thanks for diving in!

rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java Outdated Show resolved Hide resolved
rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java Outdated Show resolved Hide resolved
@timtebeek timtebeek merged commit a87527a into main Aug 22, 2024
2 checks passed
@timtebeek timtebeek deleted the add-dependency-override-parent branch August 22, 2024 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timtebeek timtebeek timtebeek approved these changes

Assignees

@Laurens-W Laurens-W

Labels
bug Something isn't working
Projects
OpenRewrite
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Laurens-W @timtebeek