[MENFORCER-426] DependencyConvergence transitive dependencies with version range #259
Conversation
This file contains 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
cstamas
added a commit
to apache/maven-resolver
that referenced
this pull request
Mar 24, 2023
…ersion ordering (#271) Our two collector implementations produce slightly different dirty trees when in transitive dependencies ranges are in use. The new BF produces (w/ and w/o skipper) produces this dirty tree: ``` menforcer426:aid:ext:1 compile +- menforcer426:bid:ext:1 compile | +- menforcer426:cid:ext:3 compile | +- menforcer426:cid:ext:2 compile | \- menforcer426:cid:ext:1 compile +- menforcer426:cid:ext:3 compile +- menforcer426:cid:ext:2 compile \- menforcer426:cid:ext:1 compile ``` The "old" DF produces this one: ``` menforcer426:aid:ext:1 compile +- menforcer426:bid:ext:1 compile | +- menforcer426:cid:ext:1 compile | +- menforcer426:cid:ext:2 compile | \- menforcer426:cid:ext:3 compile +- menforcer426:cid:ext:1 compile +- menforcer426:cid:ext:2 compile \- menforcer426:cid:ext:3 compile ``` Spot the difference: the two dirty trees are "semantically" (or content-wise?) equal/same, except for the artifact ordering, where there was a version range (collector in this case discovers available versions that "fits" range and created nodes for them, one for each version that lies within version constraint). DF collector relies and provides "metadata based" ordering (as metadata contained the versions), while BF explicitly sorts them in descending order (for internal optimization purposes). Point is, both dirty trees are ok. But, Conflict resolver in verbose mode for two inputs above produces different outputs. For DF with "divergence found", while for BF "no divergence found" (correctly). Overall changes in this PR: * most are test and test related resources * cosmetic changes like javadoc typos, adding override etc * added reusable `DependencyGraphDumper` * key changes are in `ConflictResolver` covered by `ConflictResolverTest` UT changes * overall fix is to make `ConflictResolver` insensitive to input dirty tree version ordering, make sure output is same for "semantically" (or content-wise?) same inputs. How tested this: * built/installed this PR * built maven-3.9.x with this resolver * ran maven IT suite -- OK * ran apache/maven-enforcer#259 w/ built maven (so fixed resolver is used). This PR contains only one reproducer IT that fails with any released Maven version -- OK w/ maven built as above. Just realized how enforcer ITs are good source of inspiration for resolver use cases, so many if not all of new tests are actually inspired by enforcer ITs. --- https://issues.apache.org/jira/browse/MRESOLVER-345
…rsion range IT for ensure that DependencyConvergence with transitive dependencies with version range works correctly Root cause was fixed in Maven 3.9.2
slawekjaranowski
force-pushed
the
MENFORCER-426
branch
from
c34ab15 to
585a3c2
Compare
slawekjaranowski
changed the title
elharo
approved these changes
May 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Following this checklist to help us incorporate your
contribution quickly and easily:
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
[MENFORCER-XXX] - Fixes bug in ApproximateQuantiles,where you replace
MENFORCER-XXXwith the appropriate JIRA issue. Best practiceis to use the JIRA issue title in the pull request title and in the first line of the
commit message.
mvn clean verifyto make sure basic checks pass. A more thorough check willbe performed on your pull request automatically.
mvn -Prun-its clean verify).If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.
I hereby declare this contribution to be licenced under the Apache License Version 2.0, January 2004
In any other case, please file an Apache Individual Contributor License Agreement.