This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git
The following commit(s) were added to refs/heads/master by this push:
new d9f3f17 [MRESOLVER-226] Remove usage of M2_HOME
d9f3f17 is described below
commit d9f3f176aa2aacfb6cdd21a97adbdcb3b870f149
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Nov 20 21:17:42 2021 +0100
[MRESOLVER-226] Remove usage of M2_HOME
---
.../java/org/apache/maven/resolver/internal/ant/AetherUtils.java | 7 +------
src/site/markdown/index.md.vm | 1 -
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/maven/resolver/internal/ant/AetherUtils.java
b/src/main/java/org/apache/maven/resolver/internal/ant/AetherUtils.java
index d2f6054..2a2e306 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/AetherUtils.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/AetherUtils.java
@@ -48,12 +48,7 @@ class AetherUtils
public static String getMavenHome( final Project project )
{
- final String mavenHome = project.getProperty( "maven.home" );
- if ( mavenHome != null )
- {
- return mavenHome;
- }
- return System.getenv( "M2_HOME" );
+ return project.getProperty( "maven.home" );
}
public static File findUserSettings( final Project project )
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index 76a0687..1695318 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -25,7 +25,6 @@ For the global settings, different paths will be tried:
* `${ant.home}/etc/settings.xml`
* `${maven.home}/conf/settings.xml`
-* `$M2_HOME/conf/settings.xml`
The `<settings/>` definition is used to change that:
