maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-23 Thread michaelo 
Repository: maven
Updated Branches:
  refs/heads/MNG-6102 [created] be5caccaf


[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-6102
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

h

maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-24 Thread michaelo 
Repository: maven
Updated Branches:
  refs/heads/master 149cce7a8 -> be5caccaf


[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/master
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

ht

maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2016-10-09 Thread michaelo 
Repository: maven
Updated Branches:
  refs/heads/master 49cf5d8fb -> 4ad0fb217


[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/master
Commit: 4ad0fb217c93d36cf3365b83baec48470196f5fa
Parents: 49cf5d8
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Sun Oct 9 21:00:42 2016 +0200

--
 apache-maven/src/bin/m2.conf | 3 ++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 .../src/main/java/org/apache/maven/cli/MavenCli.java | 8 
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 2 +-
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4ad0fb21/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 213dc55..5eaa760 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,8 +1,9 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
 set maven.home default ${user.home}/m2
+set maven.conf default ${maven.home}/conf
 
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/4ad0fb21/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 3fa2f14..c24acfd 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/4ad0fb21/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index 14ef3fe..b263072 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/4ad0fb21/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..ec499ca 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.home",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildin

[02/11] maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-24 Thread khmarbaise 
[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-6014
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-embedder/src/mai

[09/29] maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-25 Thread schulte 
[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-2199
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-embedder/src/mai

[09/30] maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-25 Thread schulte 
[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-2199-IT
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-embedder/src/

[13/33] maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-25 Thread schulte 
[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-5958
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-embedder/src/mai

[13/34] maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-25 Thread schulte 
[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-5958-IT
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-embedder/src/

[07/50] maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-30 Thread schulte 
[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-5359
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-embedder/src/mai

[06/50] maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-30 Thread schulte 
[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-5359-IT
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-embedder/src/