Repository: tomee Updated Branches: refs/heads/master 31e6388f4 -> fffd51229
TOMEE-1894 openejb.m2.settings is the right name for a custom settings.xml location Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fffd5122 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fffd5122 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fffd5122 Branch: refs/heads/master Commit: fffd512295a04cc518426855900622813612eb4c Parents: 31e6388 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Wed Aug 3 08:53:56 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Wed Aug 3 08:53:56 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/loader/provisining/MavenResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/fffd5122/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java ---------------------------------------------------------------------- diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java index 8978ba1..8f0a22a 100644 --- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java +++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java @@ -135,7 +135,7 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware if (f.exists()) { home = f.getAbsolutePath(); } else { - f = new File(properties.getProperty("openejb.m2.home", System.getProperty("user.home") + "/.m2/settings.xml")); + f = new File(properties.getProperty("openejb.m2.settings", System.getProperty("user.home") + "/.m2/settings.xml")); if (f.exists()) { try { final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
