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/01/31 22:08:28 UTC
[08/10] maven git commit: [MNG-5639] Support resolution of Import
Scope POMs from Repo that contains a ${parameter}
[MNG-5639] Support resolution of Import Scope POMs from Repo that contains a ${parameter}
o Updated to stop replacing external repositories when repository merging is set
to REQUEST_DOMINANT.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fe0db1c2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fe0db1c2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fe0db1c2
Branch: refs/heads/DEPMGMT-INCLUDE
Commit: fe0db1c23e348cb1c0fc6b499e0155f264b3fab1
Parents: abbefc7
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Dec 13 20:16:20 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Jan 31 23:08:06 2017 +0100
----------------------------------------------------------------------
.../project/DefaultProjectBuildingRequest.java | 19 +++++++++++--------
.../maven/project/ProjectModelResolver.java | 12 +++++++++++-
2 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/fe0db1c2/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index dafbefd..d42da04 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
@@ -80,22 +80,25 @@ public class DefaultProjectBuildingRequest
pluginArtifactRepositories = new ArrayList<>();
}
+ @SuppressWarnings( "deprecation" )
public DefaultProjectBuildingRequest( ProjectBuildingRequest request )
{
this();
- setProcessPlugins( request.isProcessPlugins() );
- setProfiles( request.getProfiles() );
setActiveProfileIds( request.getActiveProfileIds() );
+ setBuildStartTime( request.getBuildStartTime() );
setInactiveProfileIds( request.getInactiveProfileIds() );
- setSystemProperties( request.getSystemProperties() );
- setUserProperties( request.getUserProperties() );
- setRemoteRepositories( request.getRemoteRepositories() );
- setPluginArtifactRepositories( request.getPluginArtifactRepositories() );
- setRepositorySession( request.getRepositorySession() );
setLocalRepository( request.getLocalRepository() );
- setBuildStartTime( request.getBuildStartTime() );
+ setPluginArtifactRepositories( request.getPluginArtifactRepositories() );
+ setProcessPlugins( request.isProcessPlugins() );
+ setProfiles( request.getProfiles() );
setProject( request.getProject() );
+ setRemoteRepositories( request.getRemoteRepositories() );
+ setRepositoryMerging( request.getRepositoryMerging() );
+ setRepositorySession( request.getRepositorySession() );
setResolveDependencies( request.isResolveDependencies() );
+ setResolveVersionRanges( request.isResolveVersionRanges() );
+ setSystemProperties( request.getSystemProperties() );
+ setUserProperties( request.getUserProperties() );
setValidationLevel( request.getValidationLevel() );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/fe0db1c2/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index f11e77d..526e54d 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -79,6 +79,8 @@ public class ProjectModelResolver
private final Set<String> repositoryIds;
+ private final Set<String> externalRepositoryIds;
+
private final ReactorModelPool modelPool;
private final ProjectBuildingRequest.RepositoryMerging repositoryMerging;
@@ -100,7 +102,13 @@ public class ProjectModelResolver
this.repositories.addAll( externalRepositories );
this.repositoryMerging = repositoryMerging;
this.repositoryIds = new HashSet<>();
+ this.externalRepositoryIds = new HashSet<>();
this.modelPool = modelPool;
+ for ( final RemoteRepository repository : repositories )
+ {
+ this.repositoryIds.add( repository.getId() );
+ this.externalRepositoryIds.add( repository.getId() );
+ }
}
private ProjectModelResolver( ProjectModelResolver original )
@@ -114,6 +122,7 @@ public class ProjectModelResolver
this.repositories = new ArrayList<>( original.repositories );
this.repositoryMerging = original.repositoryMerging;
this.repositoryIds = new HashSet<>( original.repositoryIds );
+ this.externalRepositoryIds = new HashSet<>( original.externalRepositoryIds );
this.modelPool = original.modelPool;
}
@@ -129,7 +138,8 @@ public class ProjectModelResolver
{
if ( !repositoryIds.add( repository.getId() ) )
{
- if ( !replace )
+ if ( !replace || ( ProjectBuildingRequest.RepositoryMerging.REQUEST_DOMINANT.equals( repositoryMerging )
+ && this.externalRepositoryIds.contains( repository.getId() ) ) )
{
return;
}