Author: brianf
Date: Mon Oct 22 17:28:38 2007
New Revision: 587331
URL: http://svn.apache.org/viewvc?rev=587331&view=rev
Log:
use new OS tools for the version info.
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.0.x/pom.xml
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=587331&r1=587330&r2=587331&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 Oct 22 17:28:38 2007
@@ -19,6 +19,15 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
@@ -54,17 +63,9 @@
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LoggerManager;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id$
@@ -73,14 +74,7 @@
public class MavenCli
{
private static Embedder embedder;
-
- public static final String OS_NAME = System.getProperty( "os.name"
).toLowerCase( Locale.US );
-
- public static final String OS_ARCH = System.getProperty( "os.arch"
).toLowerCase( Locale.US );
-
- public static final String OS_VERSION = System.getProperty( "os.version"
).toLowerCase( Locale.US );
-
-
+
/**
* @noinspection ConfusingMainMethod
*/
@@ -545,13 +539,8 @@
System.out.println( "Java version: " + System.getProperty(
"java.version", "<unknown java version>" ) );
- /*
- * TODO: when plexus can return the family type, add that here
- * because it will make it easier to know what profile activation
- * settings to use
- */
- System.out.println( "OS name: \"" + OS_NAME + "\" version: \"" +
OS_VERSION + "\" arch: \"" + OS_ARCH
- + "\"" );
+ System.out.println( "OS name: \"" + Os.OS_NAME + "\" version: \""
+ Os.OS_VERSION +
+ "\" arch: \"" + Os.OS_ARCH + "\" Family: \"" +
Os.OS_FAMILY + "\"" );
}
catch ( IOException e )
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=587331&r1=587330&r2=587331&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Mon Oct 22 17:28:38 2007
@@ -220,7 +220,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.5</version>
+ <version>1.4.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
