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 jv...@apache.org on 2004/12/24 04:20:02 UTC

cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/cli MavenCli.java

jvanzyl     2004/12/23 19:20:02

  Modified:    maven-core/src/main/java/org/apache/maven/cli MavenCli.java
  Log:
  o we'll deal with v3 -> v4 conversion somewhere else.
  
  Revision  Changes    Path
  1.3       +2 -11     maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
  
  Index: MavenCli.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MavenCli.java	23 Dec 2004 23:46:41 -0000	1.2
  +++ MavenCli.java	24 Dec 2004 03:20:02 -0000	1.3
  @@ -29,8 +29,6 @@
   import org.apache.maven.execution.MavenExecutionRequest;
   import org.apache.maven.execution.MavenExecutionResponse;
   import org.apache.maven.execution.project.MavenProjectExecutionRequest;
  -import org.apache.maven.execution.project.MavenProjectExecutionRequest;
  -import org.apache.maven.execution.reactor.MavenReactorExecutionRequest;
   import org.apache.maven.execution.reactor.MavenReactorExecutionRequest;
   import org.apache.maven.repository.RepositoryUtils;
   import org.codehaus.classworlds.ClassWorld;
  @@ -46,8 +44,6 @@
    */
   public class MavenCli
   {
  -    public static final String POMv3 = "project.xml";
  -
       public static final String POMv4 = "pom.xml";
   
       public static final String userHome = System.getProperty( "user.home" );
  @@ -127,14 +123,9 @@
   
               if ( !projectFile.exists() )
               {
  -                projectFile = new File( userDir, POMv3 );
  -
  -                if ( !projectFile.exists() )
  -                {
  -                    System.err.println( "Could not find either a " + POMv4 + " nor a " + POMv3 + " project descriptor." );
  +                    System.err.println( "Could not find either a project descriptor." );
   
                       return 1;
  -                }
               }
   
               request = new MavenProjectExecutionRequest( localRepository,