Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0AC68200C32 for ; Wed, 1 Feb 2017 21:33:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0922B160B6A; Wed, 1 Feb 2017 20:33:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3C3CA160B69 for ; Wed, 1 Feb 2017 21:33:57 +0100 (CET) Received: (qmail 1252 invoked by uid 500); 1 Feb 2017 20:33:55 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 99624 invoked by uid 99); 1 Feb 2017 20:33:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2017 20:33:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A6AE2F29DC; Wed, 1 Feb 2017 20:33:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: schulte@apache.org To: commits@maven.apache.org Date: Wed, 01 Feb 2017 20:34:10 -0000 Message-Id: <2228c3dd33db4903aca5af358b75df6f@git.apache.org> In-Reply-To: <854694fb30fe43b4a80925f642746004@git.apache.org> References: <854694fb30fe43b4a80925f642746004@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/25] maven git commit: [MNG-5639] Support resolution of Import Scope POMs from Repo that contains a ${parameter} archived-at: Wed, 01 Feb 2017 20:33:58 -0000 [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/def2738a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/def2738a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/def2738a Branch: refs/heads/DEPMGMT Commit: def2738a549aa6c2ee3f72bdb92e872592749317 Parents: 2069b82 Author: Christian Schulte Authored: Tue Dec 13 20:16:20 2016 +0100 Committer: Christian Schulte Committed: Wed Feb 1 21:22:33 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/def2738a/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/def2738a/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 repositoryIds; + private final Set 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; }