cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/project DefaultMavenProjectBuilder.java

[brett]

brett       2005/03/28 23:02:29

  Modified:    maven-core/src/main/java/org/apache/maven/project
                        DefaultMavenProjectBuilder.java
  Log:
  fix repository inheritence
  
  Revision  Changes    Path
  1.59      +3 -4      
maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
  
  Index: DefaultMavenProjectBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- DefaultMavenProjectBuilder.java   24 Mar 2005 05:01:05 -0000      1.58
  +++ DefaultMavenProjectBuilder.java   29 Mar 2005 07:02:29 -0000      1.59
  @@ -267,11 +267,13 @@
                                             List 
aggregatedRemoteWagonRepositories )
           throws ProjectBuildingException
       {
  +        aggregatedRemoteWagonRepositories.addAll( buildArtifactRepositories( 
model.getRepositories() ) );
  +
           MavenProject project = new MavenProject( model );
   
           lineage.addFirst( project );
   
  -        Parent parentModel = project.getModel().getParent();
  +        Parent parentModel = model.getParent();
   
           if ( parentModel != null )
           {
  @@ -297,9 +299,6 @@
               // as we go in order to do this.
               // 
----------------------------------------------------------------------
   
  -            aggregatedRemoteWagonRepositories.addAll(
  -                buildArtifactRepositories( 
project.getModel().getRepositories() ) );
  -
               MavenProject parent;
               Model cachedModel = getCachedModel( parentModel.getGroupId(), 
parentModel.getArtifactId(),
                                                   parentModel.getVersion() );