From 31acddf85692c647f930b722d501a55cd01c64a4 Mon Sep 17 00:00:00 2001
From: Brian Topping <brian@mauswerks.net>
Date: Wed, 17 Sep 2014 15:24:33 -0400
Subject: [PATCH] Additional updates, should be clean now.

---
 ivy/src/main/scala/sbt/Resolver.scala | 16 +++++++++-------
 notes/0.13.7/maven-home.md            |  8 ++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 notes/0.13.7/maven-home.md

diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala
index 9ba5d56ce..f7318fb5a 100644
--- a/ivy/src/main/scala/sbt/Resolver.scala
+++ b/ivy/src/main/scala/sbt/Resolver.scala
@@ -5,7 +5,7 @@ package sbt
 
 import java.io.File
 import java.net.URL
-import scala.xml.{ XML, NodeSeq }
+import scala.xml.{ Text, NodeSeq, Elem, XML }
 import org.apache.ivy.plugins.resolver.DependencyResolver
 
 sealed trait Resolver {
@@ -303,17 +303,19 @@ object Resolver {
   private[this] def mavenLocalDir: File = {
     def loadHomeFromSettings(f: () => File): Option[File] =
       try {
-        XML.loadFile(f()) \ "settings" \ "localRepository" match {
-          case scala.xml.Text(loc) => Some(new File(loc))
-          case _                   => None
+        val file = XML.loadFile(f())
+        (file \ "localRepository").text match {
+          case ""    => None
+          case e @ _ => Some(new File(e))
         }
       } catch {
-        case _: Throwable => None
+        // Occurs inside File constructor when property or environment variable does not exist
+        case _: NullPointerException => None
       }
     loadHomeFromSettings(() => new File(Path.userHome, ".m2/settings.xml")) orElse
-      loadHomeFromSettings(() => new File(Path.fileProperty("M2_HOME"), "conf/settings.xml")) getOrElse
+      loadHomeFromSettings(() => new File(new File(System.getenv("M2_HOME")), "conf/settings.xml")) getOrElse
       new File(Path.userHome, ".m2/repository")
-    }
+  }
   def publishMavenLocal = Resolver.file("publish-m2-local", mavenLocalDir)
   def mavenLocal = MavenRepository("Maven2 Local", mavenLocalDir.toURI.toString)
   def defaultLocal = defaultUserFileRepository("local")
diff --git a/notes/0.13.7/maven-home.md b/notes/0.13.7/maven-home.md
new file mode 100644
index 000000000..e039fe8b0
--- /dev/null
+++ b/notes/0.13.7/maven-home.md
@@ -0,0 +1,8 @@
+  [1600]: https://github.com/sbt/sbt/pull/1600
+  [@topping]: https://github.com/topping
+  
+### Improvements
+
+* Maven local repository is now resolved from the first of the <localRepository/> element in ~/.m2/settings.xml, $M2_HOME/conf/settings.xml or the default of 
+  ~/.m2/repository if neither of those configuration elements exist. If more Maven settings are required to be recovered, the proper thing to do is merge 
+  the two possible settings.xml files, then query against the element path of the merge.  This code avoids the merge by checking sequentially.
\ No newline at end of file