You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/02/13 23:51:06 UTC
maven git commit: [MNG-5976] Replace Plexus Utils OS with Commons
Lang SystemUtils
Repository: maven
Updated Branches:
refs/heads/master 6518f1f36 -> fbf8b544d
[MNG-5976] Replace Plexus Utils OS with Commons Lang SystemUtils
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fbf8b544
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fbf8b544
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fbf8b544
Branch: refs/heads/master
Commit: fbf8b544df5301df0a9b6a5198f7934889818669
Parents: 6518f1f
Author: Michael Osipov <mi...@apache.org>
Authored: Sat Feb 13 23:49:32 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sat Feb 13 23:49:32 2016 +0100
----------------------------------------------------------------------
.../org/apache/maven/cli/CLIReportingUtils.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/fbf8b544/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 8f38661..a901cc5 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -26,7 +26,7 @@ import java.util.Date;
import java.util.Locale;
import java.util.Properties;
-import org.codehaus.plexus.util.Os;
+import org.apache.commons.lang3.SystemUtils;
import org.slf4j.Logger;
/**
@@ -68,8 +68,19 @@ public final class CLIReportingUtils
version.append( "Java home: " ).append( System.getProperty( "java.home", "<unknown Java home>" ) ).append( ls );
version.append( "Default locale: " ).append( Locale.getDefault() ).append( ", platform encoding: " ).append(
System.getProperty( "file.encoding", "<unknown encoding>" ) ).append( ls );
- version.append( "OS name: \"" ).append( Os.OS_NAME ).append( "\", version: \"" ).append( Os.OS_VERSION ).append(
- "\", arch: \"" ).append( Os.OS_ARCH ).append( "\", family: \"" ).append( Os.OS_FAMILY ).append( '\"' );
+ version.append( "OS name: \"" ).append( SystemUtils.OS_NAME ).
+ append( "\", version: \"" ).append( SystemUtils.OS_VERSION ).
+ append( "\", arch: \"" ).append( SystemUtils.OS_ARCH );
+ String osFamily = "<unknown family>";
+ if ( SystemUtils.IS_OS_WINDOWS )
+ {
+ osFamily = "Windows";
+ }
+ else if ( SystemUtils.IS_OS_UNIX )
+ {
+ osFamily = "Unix";
+ }
+ version.append( "\", family: \"" ).append( osFamily ).append( '\"' );
return version.toString();
}