mirror of https://github.com/apache/maven.git
fix repository inheritence
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163703 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
e3c15069c5
commit
2fb808c703
|
@ -267,11 +267,13 @@ public class DefaultMavenProjectBuilder
|
||||||
List aggregatedRemoteWagonRepositories )
|
List aggregatedRemoteWagonRepositories )
|
||||||
throws ProjectBuildingException
|
throws ProjectBuildingException
|
||||||
{
|
{
|
||||||
|
aggregatedRemoteWagonRepositories.addAll( buildArtifactRepositories( model.getRepositories() ) );
|
||||||
|
|
||||||
MavenProject project = new MavenProject( model );
|
MavenProject project = new MavenProject( model );
|
||||||
|
|
||||||
lineage.addFirst( project );
|
lineage.addFirst( project );
|
||||||
|
|
||||||
Parent parentModel = project.getModel().getParent();
|
Parent parentModel = model.getParent();
|
||||||
|
|
||||||
if ( parentModel != null )
|
if ( parentModel != null )
|
||||||
{
|
{
|
||||||
|
@ -297,9 +299,6 @@ public class DefaultMavenProjectBuilder
|
||||||
// as we go in order to do this.
|
// as we go in order to do this.
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
|
|
||||||
aggregatedRemoteWagonRepositories.addAll(
|
|
||||||
buildArtifactRepositories( project.getModel().getRepositories() ) );
|
|
||||||
|
|
||||||
MavenProject parent;
|
MavenProject parent;
|
||||||
Model cachedModel = getCachedModel( parentModel.getGroupId(), parentModel.getArtifactId(),
|
Model cachedModel = getCachedModel( parentModel.getGroupId(), parentModel.getArtifactId(),
|
||||||
parentModel.getVersion() );
|
parentModel.getVersion() );
|
||||||
|
|
Loading…
Reference in New Issue