You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2015/04/01 02:24:18 UTC
[36/50] [abbrv] maven git commit: MNG-5774 restored MavenCli
user/global settings location contants
MNG-5774 restored MavenCli user/global settings location contants
Signed-off-by: Igor Fedorenko <if...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cc429e84
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cc429e84
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cc429e84
Branch: refs/heads/slf4j-log4j2
Commit: cc429e84515a2f6bae05cd7cd81c3f622d0c8b57
Parents: eae9a88
Author: Igor Fedorenko <if...@apache.org>
Authored: Wed Mar 11 18:24:14 2015 -0400
Committer: Igor Fedorenko <if...@apache.org>
Committed: Wed Mar 11 18:24:14 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cc429e84/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 ced883c..3966095 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
@@ -130,6 +130,17 @@ public class MavenCli
@SuppressWarnings( "checkstyle:constantname" )
public static final File userMavenConfigurationHome = new File( userHome, ".m2" );
+ /**
+ * @deprecated use {@link SettingsXmlConfigurationProcessor#DEFAULT_USER_SETTINGS_FILE}
+ */
+ public static final File DEFAULT_USER_SETTINGS_FILE = SettingsXmlConfigurationProcessor.DEFAULT_USER_SETTINGS_FILE;
+
+ /**
+ * @deprecated use {@link SettingsXmlConfigurationProcessor#DEFAULT_GLOBAL_SETTINGS_FILE}
+ */
+ public static final File DEFAULT_GLOBAL_SETTINGS_FILE =
+ SettingsXmlConfigurationProcessor.DEFAULT_GLOBAL_SETTINGS_FILE;
+
public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File( userMavenConfigurationHome, "toolchains.xml" );
public static final File DEFAULT_GLOBAL_TOOLCHAINS_FILE =