svn commit: r1755406 - /maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-181/
Author: gboue Date: Sat Aug 6 18:38:21 2016 New Revision: 1755406 URL: http://svn.apache.org/viewvc?rev=1755406&view=rev Log: [MDEPLOY-181] DeployAtEnd cannot be overwritten from command line using -DdeployAtEnd=false This issue is closed as "Not A Problem", removing the IT introduced in r1620139. It is expected for the parameters configured in the POM to have precedence over the ones from the default configuration. Removed: maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-181/
maven git commit: [MNG-6076] Add the options from maven.config at the beginning to make it possible to overwrite via command line o Currently this only helps for properties which are defined via -D..
Repository: maven
Updated Branches:
refs/heads/master 9cd04784e -> b0be4e3a2 (forced update)
[MNG-6076] Add the options from maven.config at the beginning to make it
possible to overwrite via command line
o Currently this only helps for properties which are defined via
-D.. in maven.config file. For other options like -T .. etc.
this will not work cause the command line analyzer only looks
for the first occurrence of options.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b0be4e3a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b0be4e3a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b0be4e3a
Branch: refs/heads/master
Commit: b0be4e3a20e209b696c8c0d0a004ab15a0b563d0
Parents: a5e87a4
Author: Karl Heinz Marbaise
Authored: Sat Aug 6 18:48:58 2016 +0200
Committer: Karl Heinz Marbaise
Committed: Sat Aug 6 20:00:23 2016 +0200
--
.../src/main/java/org/apache/maven/cli/MavenCli.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/b0be4e3a/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 6b482aa..f203683 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,12 +35,14 @@ 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;
@@ -108,9 +110,6 @@ 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;
@@ -121,6 +120,10 @@ 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
/**
@@ -393,7 +396,7 @@ public class MavenCli
CLIManager cliManager = new CLIManager();
-List args = new ArrayList<>();
+List args = new LinkedList<>();
try
{
@@ -426,7 +429,7 @@ public class MavenCli
try
{
-args.addAll( 0, Arrays.asList( cliRequest.args ) );
+args.addAll( Arrays.asList( cliRequest.args ) );
cliRequest.commandLine = cliManager.parse( args.toArray( new
String[args.size()] ) );
}
catch ( ParseException e )
maven git commit: [MNG-6076] Add the options from maven.config at the beginning to make it possible to overwrite via command line o Currently this only helps for properties which are defined via -
Repository: maven
Updated Branches:
refs/heads/master a5e87a423 -> 9cd04784e
[MNG-6076]Â Add the options from maven.config at the beginning to make it
possible to overwrite via command line
o Currently this only helps for properties which are defined via
-D.. in maven.config file. For other options like -T .. etc.
this will not work cause the command line analyzer only looks
for the first occurrence of options.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9cd04784
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9cd04784
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9cd04784
Branch: refs/heads/master
Commit: 9cd04784e46c033fe40116b7c5ff6f41cb52e0af
Parents: a5e87a4
Author: Karl Heinz Marbaise
Authored: Sat Aug 6 18:48:58 2016 +0200
Committer: Karl Heinz Marbaise
Committed: Sat Aug 6 18:48:58 2016 +0200
--
.../src/main/java/org/apache/maven/cli/MavenCli.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/9cd04784/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 6b482aa..f203683 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,12 +35,14 @@ 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;
@@ -108,9 +110,6 @@ 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;
@@ -121,6 +120,10 @@ 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
/**
@@ -393,7 +396,7 @@ public class MavenCli
CLIManager cliManager = new CLIManager();
-List args = new ArrayList<>();
+List args = new LinkedList<>();
try
{
@@ -426,7 +429,7 @@ public class MavenCli
try
{
-args.addAll( 0, Arrays.asList( cliRequest.args ) );
+args.addAll( Arrays.asList( cliRequest.args ) );
cliRequest.commandLine = cliManager.parse( args.toArray( new
String[args.size()] ) );
}
catch ( ParseException e )
svn commit: r1755405 - /maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
Author: khmarbaise
Date: Sat Aug 6 16:35:09 2016
New Revision: 1755405
URL: http://svn.apache.org/viewvc?rev=1755405&view=rev
Log:
Fixed link.
Modified:
maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
Modified: maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt?rev=1755405&r1=1755404&r2=1755405&view=diff
==
--- maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt Sat Aug
6 16:35:09 2016
@@ -131,7 +131,7 @@ Guide to Using Toolchains
configured in our <<>> above executes, it will see that a JDK
toolchain is set in the MavenSession and will thereby use
that toolchain (that would be the JDK installed at <<>>
for our example) to compile the sources.
- Starting with {{{./docs/3.3.1/release-notes.html}Maven 3.3.1}} you can put
the <<>>
+ Starting with {{{/docs/3.3.1/release-notes.html}Maven 3.3.1}} you can put
the <<>>
file wherever you like by using the <<<--global-toolchains file>>> option
but it is recommended to
locate it into <<<$\{user.home\}/.m2/>>>.
svn commit: r1755404 - /maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
Author: khmarbaise
Date: Sat Aug 6 16:33:01 2016
New Revision: 1755404
URL: http://svn.apache.org/viewvc?rev=1755404&view=rev
Log:
Added hint about new Maven 3.3.1 support for toolchains.
Modified:
maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
Modified: maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt?rev=1755404&r1=1755403&r2=1755404&view=diff
==
--- maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt
(original)
+++ maven/site/trunk/content/apt/guides/mini/guide-using-toolchains.apt Sat Aug
6 16:33:01 2016
@@ -131,6 +131,11 @@ Guide to Using Toolchains
configured in our <<>> above executes, it will see that a JDK
toolchain is set in the MavenSession and will thereby use
that toolchain (that would be the JDK installed at <<>>
for our example) to compile the sources.
+ Starting with {{{./docs/3.3.1/release-notes.html}Maven 3.3.1}} you can put
the <<>>
+ file wherever you like by using the <<<--global-toolchains file>>> option
but it is recommended to
+ locate it into <<<$\{user.home\}/.m2/>>>.
+
+
+-+
svn commit: r1755403 - /maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md
Author: khmarbaise Date: Sat Aug 6 16:20:41 2016 New Revision: 1755403 URL: http://svn.apache.org/viewvc?rev=1755403&view=rev Log: Added information about new --global-toolchains option to the release notes for Maven 3.3.1 Modified: maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md Modified: maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md URL: http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md?rev=1755403&r1=1755402&r2=1755403&view=diff == --- maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md (original) +++ maven/site/trunk/content/markdown/docs/3.3.1/release-notes.md Sat Aug 6 16:20:41 2016 @@ -69,6 +69,9 @@ The new [Maven 3.3.1 Release is just out * Maven has been improved to read the `toolchains.xml` file [during initialization][MNG-5754] instead of waiting till [maven-toolchains-plugin][maven-toolchains-plugin] will read it. +* Maven has a new option to handle global toolchains file `-gt file` or `--global-toolchains file` + in the spirit of global settings file[MNG-3891][MNG-3891]. + ### Core Extensions * Core Extension mechanism has [been improved][MNG-5771] to make
