Repository: maven Updated Branches: refs/heads/master b0be4e3a2 -> 4ba577959
Revert "[MNG-6076] Add the options from maven.config at the beginning to make it" This reverts commit b0be4e3a20e209b696c8c0d0a004ab15a0b563d0. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4ba57795 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4ba57795 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4ba57795 Branch: refs/heads/master Commit: 4ba57795988fb813c80a8216ca8ec22aa00ae07d Parents: b0be4e3 Author: Karl Heinz Marbaise <[email protected]> Authored: Sun Aug 7 12:23:59 2016 +0200 Committer: Karl Heinz Marbaise <[email protected]> Committed: Sun Aug 7 12:23:59 2016 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/maven/cli/MavenCli.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/4ba57795/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 f203683..6b482aa 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 @@ -35,14 +35,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; - import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.ParseException; import org.apache.commons.cli.UnrecognizedOptionException; @@ -110,6 +108,9 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti import org.codehaus.plexus.logging.LoggerManager; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import com.google.common.base.Charsets; +import com.google.common.io.Files; +import com.google.inject.AbstractModule; import org.eclipse.aether.transfer.TransferListener; import org.slf4j.ILoggerFactory; import org.slf4j.Logger; @@ -120,10 +121,6 @@ import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; import org.sonatype.plexus.components.sec.dispatcher.SecUtil; import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity; -import com.google.common.base.Charsets; -import com.google.common.io.Files; -import com.google.inject.AbstractModule; - // TODO: push all common bits back to plexus cli and prepare for transition to Guice. We don't need 50 ways to make CLIs /** @@ -396,7 +393,7 @@ public class MavenCli CLIManager cliManager = new CLIManager(); - List<String> args = new LinkedList<>(); + List<String> args = new ArrayList<>(); try { @@ -429,7 +426,7 @@ public class MavenCli try { - args.addAll( Arrays.asList( cliRequest.args ) ); + args.addAll( 0, Arrays.asList( cliRequest.args ) ); cliRequest.commandLine = cliManager.parse( args.toArray( new String[args.size()] ) ); } catch ( ParseException e )
