maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/project DefaultMavenProjectBuilder.java
Date Wed, 16 Mar 2005 03:58:18 GMT
brett       2005/03/15 19:58:18

  Modified:    maven-core/src/main/java/org/apache/maven/project
                        DefaultMavenProjectBuilder.java
  Log:
  PR: MNG-204
  DAG needs to account for the project's inherited parent
  
  Revision  Changes    Path
  1.47      +10 -1     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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- DefaultMavenProjectBuilder.java	16 Mar 2005 03:39:54 -0000	1.46
  +++ DefaultMavenProjectBuilder.java	16 Mar 2005 03:58:18 -0000	1.47
  @@ -379,7 +379,16 @@
   
                   if ( dag.getVertex( dependencyArtifactId ) != null )
                   {
  -                    dag.addEdge( artifactId, dependency.getArtifactId() );
  +                    dag.addEdge( artifactId, dependencyArtifactId );
  +                }
  +            }
  +
  +            MavenProject parent = project.getParent();
  +            if ( parent != null )
  +            {
  +                if ( dag.getVertex( parent.getArtifactId() ) != null )
  +                {
  +                    dag.addEdge( artifactId, parent.getArtifactId() );
                   }
               }
           }
  
  
  

Mime
View raw message