You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/06/04 18:07:17 UTC

[31/50] maven git commit: Minor cleanup in MavenCli.java

Minor cleanup in MavenCli.java

There is some unnecessary code in the MavenCli.java from line #1465 to #1474.
The functionality has been moved to line #1215.

Signed-off-by: Karl Heinz Marbaise <kh...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4c6d3a34
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4c6d3a34
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4c6d3a34

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 4c6d3a3462783507921d1a0100e3fa22ef8a98e4
Parents: a4b0b63
Author: Stefan Eicher <st...@gmail.com>
Authored: Wed Apr 5 20:52:01 2017 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Wed Apr 5 23:51:26 2017 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/maven/cli/MavenCli.java     | 11 -----------
 1 file changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/4c6d3a34/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 004cf4e..877b88b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1462,17 +1462,6 @@ public class MavenCli
             alternatePomFile = commandLine.getOptionValue( CLIManager.ALTERNATE_POM_FILE );
         }
 
-        File userToolchainsFile;
-        if ( commandLine.hasOption( CLIManager.ALTERNATE_USER_TOOLCHAINS ) )
-        {
-            userToolchainsFile = new File( commandLine.getOptionValue( CLIManager.ALTERNATE_USER_TOOLCHAINS ) );
-            userToolchainsFile = resolveFile( userToolchainsFile, workingDirectory );
-        }
-        else
-        {
-            userToolchainsFile = MavenCli.DEFAULT_USER_TOOLCHAINS_FILE;
-        }
-
         request.setBaseDirectory( baseDirectory ).setGoals( goals ).setSystemProperties(
             cliRequest.systemProperties ).setUserProperties( cliRequest.userProperties ).setReactorFailureBehavior(
             reactorFailureBehaviour ) // default: fail fast