Merge pull request sbt#12 from ScrapCodes/maven-user-props

Support passing user properties to pom.

Author: jsuereth

src/main/scala/com/typesafe/sbt/pom/Keys.scala

@@ -9,4 +9,5 @@ object SbtPomKeys {
   val mvnLocalRepository = SettingKey[File]("mvn-local-repository", "The location of the maven local repository we can use to cache artifacts.")
   val effectivePom = SettingKey[Model]("mvn-effective-pom", "Reads the maven effective pom.")
   val showEffectivePom = TaskKey[Unit]("show-effective-pom", "Displays the effective pom from maven.")
+  val mavenUserProperties = SettingKey[Map[String, String]]("maven-user-properties","A map of user properties to be applied")
 }

src/main/scala/com/typesafe/sbt/pom/MavenHelper.scala

@@ -22,7 +22,7 @@ object MavenHelper {
   def loadPomInSettings: Seq[Setting[_]]= Seq(
     pomLocation <<= baseDirectory apply (_ / "pom.xml"),
     mvnLocalRepository := defaultLocalRepo,
-    effectivePom <<= (pomLocation, mvnLocalRepository, profiles) apply loadEffectivePom,
+    effectivePom <<= (pomLocation, mvnLocalRepository, profiles, mavenUserProperties) apply loadEffectivePom,
     showEffectivePom <<= (pomLocation, effectivePom, streams) map showPom
   )
 

src/main/scala/com/typesafe/sbt/pom/MavenPomResolver.scala

@@ -42,8 +42,10 @@ class MvnPomResolver(system: RepositorySystem, localRepo: File) {
    }
 
    def loadEffectivePom(pomFile: File, repositories: Seq[RemoteRepository],
-       activeProfiles: Seq[String]): Model =
+       activeProfiles: Seq[String], userPropsMap: Map[String, String]): Model =
      try {
+       val userProperties = new java.util.Properties()
+       userProperties.putAll(userPropsMap.asJava)
        val request = new DefaultModelBuildingRequest
        request setLocationTracking true
        request setProcessPlugins false
@@ -62,8 +64,6 @@ class MvnPomResolver(system: RepositorySystem, localRepo: File) {
          // TODO - Wrap in better exception...
          throw e
      }
-   // TODO - Allow these to be specified...
-   val userProperties = new java.util.Properties
 
    lazy val systemProperties = {
      val props = new java.util.Properties

src/main/scala/com/typesafe/sbt/pom/MavenProjectHelper.scala

@@ -43,9 +43,9 @@ object MavenProjectHelper {
   case class SimpleProject(model: PomModel, dir: File) extends ProjectTree
 
   def makeReactorProject(baseDir: File, overrideRootProjectName:Option[String] = None,
-                         profiles: Seq[String]): Seq[Project] = {
+                         profiles: Seq[String], userProps: Map[String, String]): Seq[Project] = {
     // First create a tree of how things aggregate.
-    val tree = makeProjectTree(baseDir / "pom.xml", profiles)
+    val tree = makeProjectTree(baseDir / "pom.xml", profiles, userProps)
     // Next flatten the list of all projects.
     val projects = allProjectsInTree(tree)
     // Create a mapping of all dependencies between projects.
@@ -117,9 +117,9 @@ object MavenProjectHelper {
     overrideName.getOrElse(pomName.getOrElse(directoryName))
   }
 
-  def makeProjectTree(pomFile: File, profiles: Seq[String]): ProjectTree = {
-    val pom = loadEffectivePom(pomFile, profiles = profiles)
-    val children = getChildProjectPoms(pom, pomFile) map (makeProjectTree(_, profiles))
+  def makeProjectTree(pomFile: File, profiles: Seq[String], userProps: Map[String, String]): ProjectTree = {
+    val pom = loadEffectivePom(pomFile, profiles = profiles, userProps = userProps)
+    val children = getChildProjectPoms(pom, pomFile) map (makeProjectTree(_, profiles, userProps))
     if(children.isEmpty) SimpleProject(pom, pomFile.getParentFile)
     else AggregateProject(pom, pomFile.getParentFile, children)
   }

src/main/scala/com/typesafe/sbt/pom/PomBuild.scala

@@ -11,13 +11,21 @@ import Project.Initialize
 trait PomBuild extends Build {
   import SbtPomKeys._
   import MavenHelper._
+
   val profiles: Seq[String] = Seq()
 
+  /** These can be used to override properties in maven pom */
+  val userPropertiesMap: Map[String, String] = Map.empty
+
+  override def settings = {
+    super.settings ++ Seq(SbtPomKeys.profiles := profiles, SbtPomKeys.mavenUserProperties := userPropertiesMap)
+  }
+
   lazy val overrideRootProjectName:Option[String] = None
   override def projectDefinitions(baseDirectory: File): Seq[Project] = {
     // If we detect a maven parent pom, use it.
     if((baseDirectory / "pom.xml").exists)
-      MavenProjectHelper.makeReactorProject(baseDirectory, overrideRootProjectName, profiles)
+      MavenProjectHelper.makeReactorProject(baseDirectory, overrideRootProjectName, profiles, userPropertiesMap)
     else super.projectDefinitions(baseDirectory)
   }
 }

src/main/scala/com/typesafe/sbt/pom/package.scala

@@ -37,6 +37,6 @@ package object pom {
     (file(sys.props("user.home")) / ".m2" / "repository")
   }
 
-  def loadEffectivePom(pom: File, localRepo: File = defaultLocalRepo, profiles: Seq[String]) =
-    MvnPomResolver(localRepo).loadEffectivePom(pom, Seq.empty, profiles)
+  def loadEffectivePom(pom: File, localRepo: File = defaultLocalRepo, profiles: Seq[String], userProps: Map[String, String]) =
+    MvnPomResolver(localRepo).loadEffectivePom(pom, Seq.empty, profiles, userProps)
 }