maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tryg...@apache.org
Subject cvs commit: maven-components/maven-core/src/test/resources/projects/base-directory-alignment project-which-needs-directory-alignment.xml
Date Wed, 30 Jun 2004 22:03:37 GMT
trygvis     2004/06/30 15:03:37

  Modified:    maven-core pom.xml
               maven-core/src/main/java/org/apache/maven
                        DefaultMavenCore.java Maven.java MavenCli.java
                        MavenCore.java
               maven-core/src/main/java/org/apache/maven/artifact/collector
                        DefaultArtifactCollector.java
               maven-core/src/main/java/org/apache/maven/artifact/deployer
                        ArtifactDeployer.java
               maven-core/src/main/java/org/apache/maven/project
                        DefaultMavenProjectBuilder.java MavenProject.java
                        MavenProjectBuilder.java
               maven-core/src/test/java/org/apache/maven/artifact/collector
                        DefaultArtifactCollectorTest.java
               maven-core/src/test/java/org/apache/maven/project
                        AbstractProjectTestCase.java
                        ProjectBaseDirectoryAlignmentTest.java
               maven-core/src/test/java/org/apache/maven/project/inheritance/t00
                        ProjectInheritanceTest.java
               maven-core/src/test/java/org/apache/maven/project/inheritance/t01
                        ProjectInheritanceTest.java
               maven-core/src/test/resources/projects/base-directory-alignment
                        project-which-needs-directory-alignment.xml
  Log:
  Fixing MNG-20.
  o Added getters and setters for the local repository to MavenCore
  o Added String localRepository to getProject( .. ).
  o Removed getProject( File project, boolean useParent ) in the project builder.
  o MavenCli now reads maven.repo.local from ~/build.properties.
  
  Revision  Changes    Path
  1.4       +1 -0      maven-components/maven-core/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/pom.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- pom.xml	27 Jun 2004 13:24:13 -0000	1.3
  +++ pom.xml	30 Jun 2004 22:03:36 -0000	1.4
  @@ -1,6 +1,7 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   
   <project>
  +  <modelVersion>4.0.0</modelVersion>
     <parent>
       <groupId>maven</groupId>
       <artifactId>maven-component</artifactId>
  
  
  
  1.14      +18 -9     maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java
  
  Index: DefaultMavenCore.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMavenCore.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DefaultMavenCore.java	27 Jun 2004 07:39:08 -0000	1.13
  +++ DefaultMavenCore.java	30 Jun 2004 22:03:36 -0000	1.14
  @@ -51,6 +51,8 @@
   
       private String mavenHome;
   
  +    private String localRepository;
  +
       private boolean logResults = true;
   
       // ----------------------------------------------------------------------
  @@ -220,7 +222,7 @@
               {
                   File f = (File) iterator.next();
   
  -                MavenProject project = projectBuilder.build( f );
  +                MavenProject project = projectBuilder.build( f, getLocalRepository() );
   
                   projects.add( project );
               }
  @@ -303,12 +305,6 @@
       public MavenProject getProject( File project )
           throws ProjectBuildingException
       {
  -        return getProject( project, true );
  -    }
  -
  -    public MavenProject getProject( File project, boolean useParent )
  -        throws ProjectBuildingException
  -    {
           if ( project.exists() )
           {
               if ( project.length() == 0 )
  @@ -317,7 +313,7 @@
               }
           }
   
  -        return projectBuilder.build( project, useParent );
  +        return projectBuilder.build( project, getLocalRepository() );
       }
   
       // ----------------------------------------------------------------------
  @@ -350,6 +346,20 @@
       }
   
       // ----------------------------------------------------------------------
  +    // Maven local repository
  +    // ----------------------------------------------------------------------
  +
  +    public void setLocalRepository( String localRepository )
  +    {
  +        this.localRepository = localRepository;
  +    }
  +
  +    public String getLocalRepository()
  +    {
  +        return localRepository;
  +    }
  +
  +    // ----------------------------------------------------------------------
       // Lifecylce Management
       // ----------------------------------------------------------------------
   
  @@ -379,4 +389,3 @@
           }
       }
   }
  -
  
  
  
  1.6       +15 -7     maven-components/maven-core/src/main/java/org/apache/maven/Maven.java
  
  Index: Maven.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/Maven.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Maven.java	27 Jun 2004 07:39:08 -0000	1.5
  +++ Maven.java	30 Jun 2004 22:03:36 -0000	1.6
  @@ -137,12 +137,6 @@
           return maven.getProject( project );
       }
   
  -    public MavenProject getProject( File project, boolean useParent )
  -        throws ProjectBuildingException
  -    {
  -        return maven.getProject( project, useParent );
  -    }
  -
       // ----------------------------------------------------------------------
       // Maven home
       // ----------------------------------------------------------------------
  @@ -155,5 +149,19 @@
       public String getMavenHome()
       {
           return maven.getMavenHome();
  +    }
  +
  +    // ----------------------------------------------------------------------
  +    // Maven local repository
  +    // ----------------------------------------------------------------------
  +
  +    public void setLocalRepository( String localRepository )
  +    {
  +        maven.setLocalRepository( localRepository );
  +    }
  +
  +    public String getLocalRepository()
  +    {
  +        return maven.getLocalRepository();
       }
   }
  
  
  
  1.6       +18 -1     maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java
  
  Index: MavenCli.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MavenCli.java	22 Jun 2004 16:26:10 -0000	1.5
  +++ MavenCli.java	30 Jun 2004 22:03:36 -0000	1.6
  @@ -17,7 +17,9 @@
    */
   
   import java.io.File;
  +import java.io.FileInputStream;
   import java.util.Iterator;
  +import java.util.Properties;
   import java.util.TreeMap;
   
   import org.apache.commons.cli.CommandLine;
  @@ -53,6 +55,21 @@
           String mavenHome = System.getProperty( "maven.home" );
   
           Maven maven = new Maven( mavenHome, classWorld );
  +
  +        Properties p = new Properties();
  +
  +        p.load( new FileInputStream( new File( System.getProperty( "user.home" ), "build.properties"
) ) );
  +
  +        String localRepository = p.getProperty( MavenConstants.MAVEN_REPO_LOCAL );
  +
  +        if ( localRepository == null )
  +        {
  +            throw new Exception( "Missing 'maven.repo.local' from ~/build.properties."
);
  +        }
  +
  +        System.out.println( "Using " + localRepository + " as local repo." );
  +
  +        maven.setLocalRepository( localRepository );
   
           // ----------------------------------------------------------------------
           // We will look for project2.xml files for a while so that folks can
  
  
  
  1.6       +9 -4      maven-components/maven-core/src/main/java/org/apache/maven/MavenCore.java
  
  Index: MavenCore.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/MavenCore.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MavenCore.java	27 Jun 2004 07:39:08 -0000	1.5
  +++ MavenCore.java	30 Jun 2004 22:03:36 -0000	1.6
  @@ -78,12 +78,17 @@
       String getMavenHome();
   
       // ----------------------------------------------------------------------
  +    // Maven local repository
  +    // ----------------------------------------------------------------------
  +
  +    void setLocalRepository( String localRepository );
  +
  +    String getLocalRepository();
  +
  +    // ----------------------------------------------------------------------
       // Maven project handling
       // ----------------------------------------------------------------------
   
       public MavenProject getProject( File project )
  -        throws ProjectBuildingException;
  -
  -    public MavenProject getProject( File project, boolean useParent )
           throws ProjectBuildingException;
   }
  
  
  
  1.10      +8 -2      maven-components/maven-core/src/main/java/org/apache/maven/artifact/collector/DefaultArtifactCollector.java
  
  Index: DefaultArtifactCollector.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/collector/DefaultArtifactCollector.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultArtifactCollector.java	29 Jun 2004 15:08:22 -0000	1.9
  +++ DefaultArtifactCollector.java	30 Jun 2004 22:03:37 -0000	1.10
  @@ -26,6 +26,7 @@
   import org.apache.maven.artifact.MavenArtifact;
   import org.apache.maven.artifact.resolver.ArtifactResolver;
   import org.apache.maven.model.Dependency;
  +import org.apache.maven.project.MavenProject;
   import org.apache.maven.project.MavenProjectBuilder;
   import org.apache.maven.project.ProjectBuildingException;
   
  @@ -131,7 +132,12 @@
           {
   	        try
   	        {
  -	            retValue = projectBuilder.build( pomArtifact.getFile(), true, false ).getArtifacts();
  +                MavenProject project = projectBuilder.build( pomArtifact.getFile(), localRepository,
false );
  +
  +                // TODO: Remove this when MNG-20 is solved
  +                project.setLocalRepository( localRepository );
  +
  +                retValue = project.getArtifacts();
   	        }
   	        catch ( ProjectBuildingException e )
   	        {
  
  
  
  1.3       +3 -5      maven-components/maven-core/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
  
  Index: ArtifactDeployer.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ArtifactDeployer.java	24 Jun 2004 16:27:22 -0000	1.2
  +++ ArtifactDeployer.java	30 Jun 2004 22:03:37 -0000	1.3
  @@ -16,11 +16,10 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.project.MavenProject;
  -import org.apache.maven.artifact.installer.ArtifactInstaller;
  -
   import java.io.File;
   
  +import org.apache.maven.project.MavenProject;
  +
   /**
    *
    * @author <a href="michal@codehaus.org">Michal Maczka</a>
  @@ -35,5 +34,4 @@
        * @todo we need to improve exception handling 
        */
       void deploy(  File artifact, String type, MavenProject project ) throws Exception;
  -
   }
  
  
  
  1.9       +27 -40    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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultMavenProjectBuilder.java	24 Jun 2004 17:01:51 -0000	1.8
  +++ DefaultMavenProjectBuilder.java	30 Jun 2004 22:03:37 -0000	1.9
  @@ -16,8 +16,22 @@
    * limitations under the License.
    */
   
  +import java.io.File;
  +import java.io.FileReader;
  +import java.io.IOException;
  +import java.io.InputStreamReader;
  +import java.io.Reader;
  +import java.io.StringReader;
  +import java.io.StringWriter;
  +import java.util.ArrayList;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.LinkedList;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.Properties;
  +
   import org.apache.maven.artifact.MavenArtifact;
  -import org.apache.maven.artifact.collector.ArtifactCollector;
   import org.apache.maven.artifact.factory.MavenArtifactFactory;
   import org.apache.maven.model.Dependency;
   import org.apache.maven.model.Model;
  @@ -29,6 +43,7 @@
   import org.apache.maven.project.validation.ModelValidationResult;
   import org.apache.maven.project.validation.ModelValidator;
   import org.apache.maven.wagon.manager.WagonManager;
  +
   import org.codehaus.plexus.logging.AbstractLogEnabled;
   import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
   import org.codehaus.plexus.util.CollectionUtils;
  @@ -37,21 +52,6 @@
   import org.codehaus.plexus.util.dag.DAG;
   import org.codehaus.plexus.util.dag.TopologicalSorter;
   
  -import java.io.File;
  -import java.io.FileReader;
  -import java.io.IOException;
  -import java.io.InputStreamReader;
  -import java.io.Reader;
  -import java.io.StringReader;
  -import java.io.StringWriter;
  -import java.util.ArrayList;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.LinkedList;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.Properties;
  -
   public class DefaultMavenProjectBuilder
       extends AbstractLogEnabled
       implements MavenProjectBuilder, Initializable
  @@ -60,8 +60,6 @@
   
       private ModelInheritanceAssembler modelInheritanceAssembler;
   
  -    private ArtifactCollector artifactCollector;
  -
       private WagonManager wagonManager;
   
       private ModelValidator validator;
  @@ -80,26 +78,15 @@
           modelWriter = new MavenXpp3Writer();
   
           modelReader = new MavenXpp3Reader();
  -
  -    }
  -
  -    public MavenProject build( File projectDescriptor )
  -        throws ProjectBuildingException
  -    {
  -        return build( projectDescriptor, true, false );
       }
   
  -    public MavenProject build( File projectDescriptor, boolean useParentPom )
  +    public MavenProject build( File projectDescriptor, String localRepository )
           throws ProjectBuildingException
       {
  -        // michal: I set it to false as this is backward compatible.
  -        // I think that this method should be revoved and version with 3 params should
be used exclusivly 
  -        boolean followTransitiveDeps = false;
  -
  -        return build( projectDescriptor, useParentPom, followTransitiveDeps );
  +        return build( projectDescriptor, localRepository, false );
       }
   
  -    public MavenProject build( File projectDescriptor, boolean useParentPom, boolean followTransitiveDeps
)
  +    public MavenProject build( File projectDescriptor, String localRepository, boolean
followTransitiveDeps )
           throws ProjectBuildingException
       {
           try
  @@ -108,7 +95,7 @@
   
               LinkedList lineage = new LinkedList();
   
  -            MavenProject project = assembleLineage( projectDescriptor, useParentPom, lineage
);
  +            MavenProject project = assembleLineage( projectDescriptor, localRepository,
lineage );
   
               modelInheritanceAssembler.assembleModelInheritance( ( (MavenProject) lineage.get(
0 ) ).getModel(), superModel );
   
  @@ -150,13 +137,11 @@
           }
       }
   
  -    private MavenProject assembleLineage( File projectDescriptor, boolean useParentPom,
LinkedList lineage )
  +    private MavenProject assembleLineage( File projectDescriptor, String localRepository,
LinkedList lineage )
           throws Exception
       {
           Map properties = createProjectProperties( projectDescriptor.getParentFile() );
   
  -        String mavenRepoLocal = (String) properties.get( "maven.repo.local" );
  -
           Model model = readModel( projectDescriptor );
   
           MavenProject project = new MavenProject( model );
  @@ -167,7 +152,7 @@
   
           Parent parentModel = model.getParent();
   
  -        if ( parentModel != null && useParentPom )
  +        if ( parentModel != null )
           {
               if ( isEmpty( parentModel.getGroupId() ) )
               {
  @@ -182,15 +167,17 @@
                   throw new ProjectBuildingException( "Missing version element from parent
element" );
               }
   
  -            File parentPom = findParentModel( parentModel, mavenRepoLocal );
  +            File parentPom = findParentModel( parentModel, localRepository );
   
  -            MavenProject parent = assembleLineage( parentPom, useParentPom, lineage );
  +            MavenProject parent = assembleLineage( parentPom, localRepository, lineage
);
   
               project.setParent( parent );
           }
   
           project.setProperties( properties );
   
  +        project.setLocalRepository( localRepository );
  +
           project.setFile( projectDescriptor );
   
           return project;
  @@ -268,7 +255,7 @@
           }
       }
   
  -    Map createProjectProperties( File descriptorDirectory )
  +    private Map createProjectProperties( File descriptorDirectory )
       {
           // System properties
           Properties systemProperties = System.getProperties();
  
  
  
  1.19      +0 -1      maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
  
  Index: MavenProject.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- MavenProject.java	27 Jun 2004 18:46:52 -0000	1.18
  +++ MavenProject.java	30 Jun 2004 22:03:37 -0000	1.19
  @@ -338,7 +338,6 @@
            model.setType( type );
       }
   
  -
       public void setInceptionYear( String inceptionYear )
       {
           model.setInceptionYear( inceptionYear );
  
  
  
  1.3       +2 -5      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MavenProjectBuilder.java	19 Jun 2004 20:20:54 -0000	1.2
  +++ MavenProjectBuilder.java	30 Jun 2004 22:03:37 -0000	1.3
  @@ -29,13 +29,10 @@
       //
       // ----------------------------------------------------------------------
   
  -    MavenProject build( File project )
  +    MavenProject build( File project, String localRepository )
           throws ProjectBuildingException;
   
  -    MavenProject build( File project, boolean useParentPom )
  -        throws ProjectBuildingException;
  -
  -    MavenProject build( File project, boolean useParentPom, boolean followTransitiveDeps
)
  +    MavenProject build( File project, String localRepository, boolean followTransitiveDeps
)
           throws ProjectBuildingException;
   
       // ----------------------------------------------------------------------
  
  
  
  1.5       +2 -2      maven-components/maven-core/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java
  
  Index: DefaultArtifactCollectorTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultArtifactCollectorTest.java	29 Jun 2004 15:08:22 -0000	1.4
  +++ DefaultArtifactCollectorTest.java	30 Jun 2004 22:03:37 -0000	1.5
  @@ -50,7 +50,7 @@
   
           assertTrue( "Test file: '" + f.getAbsolutePath() + "' doesn't exist!", f.exists()
);
   
  -        MavenProject project = projectBuilder.build( f );
  +        MavenProject project = projectBuilder.build( f, getLocalRepository() );
   
           assertNotNull( "Project is null", project );
   
  
  
  
  1.7       +5 -6      maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
  
  Index: AbstractProjectTestCase.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractProjectTestCase.java	29 Jun 2004 15:08:22 -0000	1.6
  +++ AbstractProjectTestCase.java	30 Jun 2004 22:03:37 -0000	1.7
  @@ -52,23 +52,22 @@
           System.setProperty( "maven.repo.local", tempLocalRepository.getPath() );
       }
   
  -    protected MavenProject buildProject( File f, boolean useParentPom, boolean followTransitiveDeps
 )
  +    protected MavenProject buildProject( File f, String localRepository, boolean followTransitiveDeps
 )
          throws Exception
       {
  -        MavenProject project = null;
  +        MavenProject project;
   
  -        project = projectBuilder.build( f, useParentPom, followTransitiveDeps );
  +        project = projectBuilder.build( f, localRepository, followTransitiveDeps );
   
           assertNotNull( "Project is null", project );
   
           return project;
  -
       }
   
  -    protected MavenProject buildProject( File f  )
  +    protected MavenProject buildProject( File f, String localRepository )
           throws Exception
       {
  -          return buildProject( f, true, false );
  +        return buildProject( f, localRepository, false );
       }
   
       protected void initRemoteRepositories( MavenProject project )
  
  
  
  1.5       +1 -1      maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
  
  Index: ProjectBaseDirectoryAlignmentTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProjectBaseDirectoryAlignmentTest.java	24 Jun 2004 00:10:18 -0000	1.4
  +++ ProjectBaseDirectoryAlignmentTest.java	30 Jun 2004 22:03:37 -0000	1.5
  @@ -15,7 +15,7 @@
       {
           File f = new File( basedir, dir + "project-which-needs-directory-alignment.xml"
);
   
  -        MavenProject project = projectBuilder.build( f, false, false );
  +        MavenProject project = projectBuilder.build( f, getLocalRepository(), false );
   
           assertNotNull( "Test project can't be null!", project );
   
  
  
  
  1.5       +2 -2      maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProjectInheritanceTest.java	27 Jun 2004 17:02:17 -0000	1.4
  +++ ProjectInheritanceTest.java	30 Jun 2004 22:03:37 -0000	1.5
  @@ -36,7 +36,7 @@
       public void testProjectInheritance()
           throws Exception
       {
  -        MavenProject p4 = projectBuilder.build( projectFile( "p4" ) );
  +        MavenProject p4 = projectBuilder.build( projectFile( "p4" ), getLocalRepository()
);
   
           assertEquals( "p4", p4.getName() );
   
  
  
  
  1.2       +6 -6      maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProjectInheritanceTest.java	24 Jun 2004 00:35:27 -0000	1.1
  +++ ProjectInheritanceTest.java	30 Jun 2004 22:03:37 -0000	1.2
  @@ -39,7 +39,7 @@
           // Check p0 value for org name
           // ----------------------------------------------------------------------
   
  -        MavenProject p0 = projectBuilder.build( projectFile( "p0" ) );
  +        MavenProject p0 = projectBuilder.build( projectFile( "p0" ), getLocalRepository()
);
   
           assertEquals( "p0-org", p0.getOrganization().getName() );
   
  @@ -47,7 +47,7 @@
           // Check p1 value for org name
           // ----------------------------------------------------------------------
   
  -        MavenProject p1 = projectBuilder.build( projectFile( "p1" ) );
  +        MavenProject p1 = projectBuilder.build( projectFile( "p1" ), getLocalRepository()
);
   
           assertEquals( "p1-org", p1.getOrganization().getName() );
   
  @@ -55,7 +55,7 @@
           // Check p2 value for org name
           // ----------------------------------------------------------------------
   
  -        MavenProject p2 = projectBuilder.build( projectFile( "p2" ) );
  +        MavenProject p2 = projectBuilder.build( projectFile( "p2" ), getLocalRepository()
);
   
           assertEquals( "p2-org", p2.getOrganization().getName() );
   
  @@ -63,7 +63,7 @@
           // Check p2 value for org name
           // ----------------------------------------------------------------------
   
  -        MavenProject p3 = projectBuilder.build( projectFile( "p3" ) );
  +        MavenProject p3 = projectBuilder.build( projectFile( "p3" ), getLocalRepository()
);
   
           assertEquals( "p3-org", p3.getOrganization().getName() );
   
  @@ -71,7 +71,7 @@
           // Check p4 value for org name
           // ----------------------------------------------------------------------
   
  -        MavenProject p4 = projectBuilder.build( projectFile( "p4" ) );
  +        MavenProject p4 = projectBuilder.build( projectFile( "p4" ), getLocalRepository()
);
   
           assertEquals( "p4-org", p4.getOrganization().getName() );
       }
  
  
  
  1.2       +1 -1      maven-components/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml
  
  Index: project-which-needs-directory-alignment.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project-which-needs-directory-alignment.xml	11 Jun 2004 15:11:56 -0000	1.1
  +++ project-which-needs-directory-alignment.xml	30 Jun 2004 22:03:37 -0000	1.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <project>
  -  <modelVersion>3</modelVersion>
  +  <modelVersion>4.0.0</modelVersion>
     <groupId>maven</groupId>
     <artifactId>project-which-needs-directory-alignment</artifactId>
     <name>Maven</name>
  
  
  

Mime
View raw message