You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2017/03/08 16:56:44 UTC
[28/30] maven git commit: [MNG-4347] import-scoped dependencies of
direct dependencies are not resolved using profile modifications from
settings.xml
[MNG-4347] import-scoped dependencies of direct dependencies are not 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.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c2e69fc1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c2e69fc1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c2e69fc1
Branch: refs/heads/DEPMGMT-INCLUDE
Commit: c2e69fc15b912d051c5bc5bd066657c1461b74ee
Parents: b14c67a
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Dec 13 03:30:32 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Mar 8 17:55:09 2017 +0100
----------------------------------------------------------------------
.../maven/repository/internal/DefaultModelResolver.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c2e69fc1/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index 260a770..0cc5b17 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -71,6 +71,8 @@ class DefaultModelResolver
private final List<RemoteRepository> externalRepositories;
+ private final Set<String> externalRepositoryIds;
+
private final ArtifactResolver resolver;
private final VersionRangeResolver versionRangeResolver;
@@ -93,8 +95,13 @@ class DefaultModelResolver
List<RemoteRepository> externalRepositories = new ArrayList<>();
externalRepositories.addAll( repositories );
this.externalRepositories = Collections.unmodifiableList( externalRepositories );
-
this.repositoryIds = new HashSet<>();
+ this.externalRepositoryIds = new HashSet<>();
+ for ( final RemoteRepository repository : this.repositories )
+ {
+ this.repositoryIds.add( repository.getId() );
+ this.externalRepositoryIds.add( repository.getId() );
+ }
}
private DefaultModelResolver( DefaultModelResolver original )
@@ -108,6 +115,7 @@ class DefaultModelResolver
this.repositories = new ArrayList<>( original.repositories );
this.externalRepositories = original.externalRepositories;
this.repositoryIds = new HashSet<>( original.repositoryIds );
+ this.externalRepositoryIds = new HashSet<>( original.externalRepositoryIds );
}
@Override
@@ -128,7 +136,7 @@ class DefaultModelResolver
if ( !repositoryIds.add( repository.getId() ) )
{
- if ( !replace )
+ if ( !replace || this.externalRepositoryIds.contains( repository.getId() ) )
{
return;
}