You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/01/08 00:35:14 UTC
svn commit: r609807 -
/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Author: vsiveton
Date: Mon Jan 7 15:35:12 2008
New Revision: 609807
URL: http://svn.apache.org/viewvc?rev=609807&view=rev
Log:
o fixed the merge from r584343
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=609807&r1=609806&r2=609807&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Mon Jan 7 15:35:12 2008
@@ -130,7 +130,7 @@
{
System.out.println( "+ Error stacktraces are turned on." );
}
-
+
// ----------------------------------------------------------------------
// Process particular command line options
// ----------------------------------------------------------------------
@@ -228,7 +228,7 @@
String profilesLine = commandLine.getOptionValue( CLIManager.ACTIVATE_PROFILES );
StringTokenizer profileTokens = new StringTokenizer( profilesLine, "," );
-
+
while ( profileTokens.hasMoreTokens() )
{
String profileAction = profileTokens.nextToken().trim();
@@ -544,12 +544,12 @@
{
System.out.println( "Maven version: " + properties.getProperty( "version", "unknown" ) );
}
-
+
System.out.println( "Java version: " + System.getProperty( "java.version", "<unknown java version>" ) );
System.out.println( "OS name: \"" + Os.OS_NAME + "\" version: \"" + Os.OS_VERSION +
"\" arch: \"" + Os.OS_ARCH + "\" Family: \"" + Os.OS_FAMILY + "\"" );
-
+
}
catch ( IOException e )
{
@@ -575,9 +575,12 @@
{
String[] defStrs = commandLine.getOptionValues( CLIManager.SET_SYSTEM_PROPERTY );
- for ( int i = 0; i < defStrs.length; ++i )
+ if ( defStrs != null )
{
- setCliProperty( defStrs[i], executionProperties );
+ for ( int i = 0; i < defStrs.length; ++i )
+ {
+ setCliProperty( defStrs[i], executionProperties );
+ }
}
}