[MNG-4347] import-scoped dependencies of direct dependencies are not resolved using profile modifications from settings.xml#159
Open
clarkperkins wants to merge 2 commits intoapache:masterfrom
Conversation
…resolved using profile modifications from settings.xml o Updated the 'DefaultModelResolver' to handle replacing repositories the same way the 'DefaultDependencyCollector' does. When the 'DefaultDependencyCollector' finds a repository in a child node with an id matching a repository already in use, it will only merge any mirror definitions but never change the repository already in use. The 'DefaultModelResolver' needs to follow the same logic. What has been provided must not change for consistency.
clarkperkins
changed the title
pzygielo
pushed a commit
to pzygielo/maven
that referenced
this pull request
Jan 4, 2023
* fix paring version problem in no-overwrite tests * fix no-overwriten tests when running in windows * fix bug resulting from line seperator difference in Windows * remove redundant code * fix the version position problem Co-authored-by: yangnuoyu <yangnuoyu@penguin>
gnodet
pushed a commit
to gnodet/maven
that referenced
this pull request
Nov 20, 2024
The HttpServer helper is used by two ITs: * MavenITmng7470ResolverTransportTest * MavenITmng5771CoreExtensionsTest And it logs in case of MNG7470 for unknown reason. My bet would be some static initing happening as side effect of OTHER ITs that use Jetty directly, like MavenITmng5868NoDuplicateAttachedArtifacts. Anyway, this sorts out Jetty logging.
gnodet
pushed a commit
to gnodet/maven
that referenced
this pull request
Nov 20, 2024
Fix for apache#159 Jetty logger not always is StdErrLog can be eg. Slf4jLog
|
Resolve #5813 |
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.
o Updated the 'DefaultModelResolver' to handle replacing repositories the same way the
'DefaultDependencyCollector' does. When the 'DefaultDependencyCollector' finds
a repository in a child node with an id matching a repository already in use,
it will only merge any mirror definitions but never change the repository already
in use. The 'DefaultModelResolver' needs to follow the same logic. What has been
provided must not change for consistency.
Cherry-picked from @ChristianSchulte's fork, per comment on the MNG-4347 ticket. I made the same changes to the ProjectModelResolver, since it seems that's the implementation that's getting used by the dependencyManagement import resolution rather than the DefaultModelResolver.