You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by br...@apache.org on 2005/03/16 05:18:06 UTC

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

brett       2005/03/15 20:18:06

  Modified:    maven-core/src/main/java/org/apache/maven/artifact
                        MavenMetadataSource.java
               maven-core/src/main/java/org/apache/maven/project
                        DefaultMavenProjectBuilder.java
                        MavenProjectBuilder.java
  Log:
  super project never has dependencies to resolve
  
  Revision  Changes    Path
  1.20      +1 -1      maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
  
  
  
  
  1.48      +1 -7      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.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- DefaultMavenProjectBuilder.java	16 Mar 2005 03:58:18 -0000	1.47
  +++ DefaultMavenProjectBuilder.java	16 Mar 2005 04:18:06 -0000	1.48
  @@ -418,19 +418,13 @@
       public MavenProject buildSuperProject( ArtifactRepository localRepository )
           throws ProjectBuildingException
       {
  -        return buildSuperProject( localRepository, false );
  -    }
  -
  -    public MavenProject buildSuperProject( ArtifactRepository localRepository, boolean resolveDependencies )
  -        throws ProjectBuildingException
  -    {
           MavenProject project = new MavenProject( getSuperModel() );
   
           try
           {
               project.setFile( new File( ".", "pom.xml" ) );
   
  -            project = processProjectLogic( project, localRepository, resolveDependencies );
  +            project = processProjectLogic( project, localRepository, false );
   
               return project;
           }
  
  
  
  1.11      +0 -3      maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
  
  Index: MavenProjectBuilder.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MavenProjectBuilder.java	16 Mar 2005 03:39:54 -0000	1.10
  +++ MavenProjectBuilder.java	16 Mar 2005 04:18:06 -0000	1.11
  @@ -36,9 +36,6 @@
       MavenProject buildSuperProject( ArtifactRepository localRepository )
           throws ProjectBuildingException;
   
  -    MavenProject buildSuperProject( ArtifactRepository localRepository, boolean transitive )
  -        throws ProjectBuildingException;
  -
       // take this out
   
       List getSortedProjects( List projects )