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/10/03 16:42:01 UTC
maven git commit: Revert "[MNG-5976] Replace Plexus Utils OS with
Commons Lang SystemUtils"
Repository: maven
Updated Branches:
refs/heads/master c2d3dec23 -> edc1a82b6
Revert "[MNG-5976] Replace Plexus Utils OS with Commons Lang SystemUtils"
This reverts commit fbf8b544df5301df0a9b6a5198f7934889818669.
Plexus Utils 3.0.24 now properly supports Windows 10. Additionally,
profile detection works with Plexus Utils, so users should see the same
values in 'mvn -v' for debugging purposes.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/edc1a82b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/edc1a82b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/edc1a82b
Branch: refs/heads/master
Commit: edc1a82b6a4243ff96d510f03eea2b5cc8df6219
Parents: c2d3dec
Author: Michael Osipov <mi...@apache.org>
Authored: Mon Oct 3 18:32:34 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Mon Oct 3 18:32:34 2016 +0200
----------------------------------------------------------------------
.../org/apache/maven/cli/CLIReportingUtils.java | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/edc1a82b/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 75da4f3..c5faef5 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
@@ -28,7 +28,7 @@ import java.util.Date;
import java.util.Locale;
import java.util.Properties;
-import org.apache.commons.lang3.SystemUtils;
+import org.codehaus.plexus.util.Os;
import org.slf4j.Logger;
/**
@@ -70,19 +70,8 @@ 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( 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( '\"' );
+ 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( '\"' );
return version.toString();
}