From b89c49adcb6d9703135bcb4670adf8f479b917e4 Mon Sep 17 00:00:00 2001 From: Brian Topping Date: Mon, 15 Sep 2014 10:48:47 -0400 Subject: [PATCH 1/4] Untested PR for #485. Unable to test because unable to build --- ivy/src/main/scala/sbt/Resolver.scala | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index 3678adadb..91368abfc 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.NodeSeq +import scala.xml.{ XML, NodeSeq } import org.apache.ivy.plugins.resolver.DependencyResolver sealed trait Resolver { @@ -300,8 +300,19 @@ object Resolver { def localBasePattern = "[organisation]/[module]/" + PluginPattern + "[revision]/[type]s/[artifact](-[classifier]).[ext]" def defaultRetrievePattern = "[type]s/[organisation]/[module]/" + PluginPattern + "[artifact](-[revision])(-[classifier]).[ext]" final val PluginPattern = "(scala_[scalaVersion]/)(sbt_[sbtVersion]/)" - - private[this] def mavenLocalDir = new File(Path.userHome, ".m2/repository/") + private[this] def mavenLocalDir: File = + { + val homeConfig = XML.loadFile(new File(Path.userHome, ".m2/settings.xml")) + homeConfig \ "settings" \ "localRepository" match { + case scala.xml.Text(x) => new File(x) + case _ => + val globalConfig = XML.loadFile(new File(Path.fileProperty("M2_HOME"), "conf/settings.xml")) + globalConfig \ "settings" \ "localRepository" match { + case scala.xml.Text(x) => new File(x) + case _ => 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") From ad7d9ce42bcc7f237da2d0d5b2efded29aeeabe3 Mon Sep 17 00:00:00 2001 From: Brian Topping Date: Mon, 15 Sep 2014 10:48:47 -0400 Subject: [PATCH 2/4] Tested PR for #485. Had a hard time squashing this, maybe because I did a merge in between. Sorry about that! --- ivy/src/main/scala/sbt/Resolver.scala | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index 91368abfc..9ba5d56ce 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -300,18 +300,19 @@ object Resolver { def localBasePattern = "[organisation]/[module]/" + PluginPattern + "[revision]/[type]s/[artifact](-[classifier]).[ext]" def defaultRetrievePattern = "[type]s/[organisation]/[module]/" + PluginPattern + "[artifact](-[revision])(-[classifier]).[ext]" final val PluginPattern = "(scala_[scalaVersion]/)(sbt_[sbtVersion]/)" - private[this] def mavenLocalDir: File = - { - val homeConfig = XML.loadFile(new File(Path.userHome, ".m2/settings.xml")) - homeConfig \ "settings" \ "localRepository" match { - case scala.xml.Text(x) => new File(x) - case _ => - val globalConfig = XML.loadFile(new File(Path.fileProperty("M2_HOME"), "conf/settings.xml")) - globalConfig \ "settings" \ "localRepository" match { - case scala.xml.Text(x) => new File(x) - case _ => new File(Path.userHome, ".m2/repository/") - } + 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 + } + } catch { + case _: Throwable => None } + loadHomeFromSettings(() => new File(Path.userHome, ".m2/settings.xml")) orElse + loadHomeFromSettings(() => new File(Path.fileProperty("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) From 31acddf85692c647f930b722d501a55cd01c64a4 Mon Sep 17 00:00:00 2001 From: Brian Topping Date: Wed, 17 Sep 2014 15:24:33 -0400 Subject: [PATCH 3/4] 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 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 From 59ea77e590deb8ccaa1161a709009057291dfc59 Mon Sep 17 00:00:00 2001 From: Brian Topping Date: Mon, 22 Sep 2014 10:56:10 -0400 Subject: [PATCH 4/4] Add warning for bad XML parse of settings file --- ivy/src/main/scala/sbt/Resolver.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ivy/src/main/scala/sbt/Resolver.scala b/ivy/src/main/scala/sbt/Resolver.scala index f7318fb5a..b0a45f949 100644 --- a/ivy/src/main/scala/sbt/Resolver.scala +++ b/ivy/src/main/scala/sbt/Resolver.scala @@ -7,6 +7,7 @@ import java.io.File import java.net.URL import scala.xml.{ Text, NodeSeq, Elem, XML } import org.apache.ivy.plugins.resolver.DependencyResolver +import org.xml.sax.SAXParseException sealed trait Resolver { def name: String @@ -311,6 +312,7 @@ object Resolver { } catch { // Occurs inside File constructor when property or environment variable does not exist case _: NullPointerException => None + case e: SAXParseException => System.err.println(s"WARNING: Problem parsing ${f().getAbsolutePath}, ${e.getMessage}"); None } loadHomeFromSettings(() => new File(Path.userHome, ".m2/settings.xml")) orElse loadHomeFromSettings(() => new File(new File(System.getenv("M2_HOME")), "conf/settings.xml")) getOrElse