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 2016/12/13 02:28:18 UTC
maven git commit: [MNG-5971] Imported dependencies should be
available to inheritance processing [MNG-5639] Support resolution of Import
Scope POMs from Repo that contains a ${parameter}
Repository: maven
Updated Branches:
refs/heads/master 39b8fc011 -> 96a55023e
[MNG-5971] Imported dependencies should be available to inheritance processing
[MNG-5639] Support resolution of Import Scope POMs from Repo that contains a ${parameter}
o Updated to resolve 'include' scope dependencies with repositories after interpolation.
Prior to this repositories were used without interpolation performed. See MNG-5639.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/96a55023
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/96a55023
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/96a55023
Branch: refs/heads/master
Commit: 96a55023e22f185eebbf868d6660d363870d3e68
Parents: 39b8fc0
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Dec 13 03:21:56 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Dec 13 03:25:18 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/model/building/DefaultModelBuilder.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/96a55023/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 119ac6c..4034fa7 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -889,7 +889,6 @@ public class DefaultModelBuilder
}
final Properties effectiveProperties = intermediateLineage.get( 0 ).getProperties();
- final List<Repository> effectiveRepositories = intermediateLineage.get( 0 ).getRepositories();
final DefaultModelProblemCollector intermediateProblems =
new DefaultModelProblemCollector( new DefaultModelBuildingResult() );
@@ -945,7 +944,7 @@ public class DefaultModelBuilder
// Sets up the resolver to use the effective repositories to support repository overriding.
if ( lenientRequest.getModelResolver() != null )
{
- for ( Repository repository : effectiveRepositories )
+ for ( Repository repository : intermediateLineage.get( 0 ).getRepositories() )
{
try
{