You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/02/28 19:23:55 UTC

svn commit: r512893 - /maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java

Author: jvanzyl
Date: Wed Feb 28 10:23:55 2007
New Revision: 512893

URL: http://svn.apache.org/viewvc?view=rev&rev=512893
Log:
o use constants from the embedder. these are CLI constants but we have so many people wanting to mimic
  the behavior of the cli that we will put them there so that embedder users don't have to pull in the cli
  just for those constants.

Modified:
    maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java

Modified: maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java?view=diff&rev=512893&r1=512892&r2=512893
==============================================================================
--- maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/trunk/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java Wed Feb 28 10:23:55 2007
@@ -43,9 +43,6 @@
  */
 public class MavenCli
 {
-    public static final File DEFAULT_GLOBAL_SETTINGS_FILE = new File( System
-        .getProperty( "maven.home", System.getProperty( "user.dir", "" ) ), "conf/settings.xml" );
-
     public static final String LOCAL_REPO_PROPERTY = "maven.repo.local";
 
     public static void main( String[] args )
@@ -342,7 +339,7 @@
 
         Configuration configuration = new DefaultConfiguration()
             .setUserSettingsFile( userSettingsFile )
-            .setGlobalSettingsFile( DEFAULT_GLOBAL_SETTINGS_FILE )
+            .setGlobalSettingsFile( MavenEmbedder.DEFAULT_GLOBAL_SETTINGS_FILE )
             .setClassWorld( classWorld );
 
         String localRepoProperty = executionProperties.getProperty( LOCAL_REPO_PROPERTY );