From 7a7acce621e42ea3f9def180ffe9a2de127a9ea3 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 28 Aug 2012 11:55:24 -0400
Subject: [PATCH] don't write <scope> section of pom if scope is 'compile'

---
 ivy/MakePom.scala                                    |  2 +-
 .../dependency-management/make-pom-type/build.sbt    |  9 +++++----
 .../multiple-classifiers/build.sbt                   | 12 ++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ivy/MakePom.scala b/ivy/MakePom.scala
index 5dc39f069..9d57bbace 100644
--- a/ivy/MakePom.scala
+++ b/ivy/MakePom.scala
@@ -212,7 +212,7 @@ class MakePom(val log: Logger)
 		scopeElem(scope) ++ optionalElem(opt)
 	}
 	def scopeElem(scope: Option[String]): NodeSeq = scope match {
-		case None => NodeSeq.Empty
+		case None | Some(Configurations.Compile.name) => NodeSeq.Empty
 		case Some(s) => <scope>{s}</scope>
 	}
 	def optionalElem(opt: Boolean)  =  if(opt) <optional>true</optional> else NodeSeq.Empty
diff --git a/sbt/src/sbt-test/dependency-management/make-pom-type/build.sbt b/sbt/src/sbt-test/dependency-management/make-pom-type/build.sbt
index 67412eeff..20400c80c 100644
--- a/sbt/src/sbt-test/dependency-management/make-pom-type/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/make-pom-type/build.sbt
@@ -15,11 +15,12 @@ TaskKey[Unit]("check-pom") <<= makePom map { file =>
 			<version>2.4.1</version>
 			<type>pom</type>
 		</dependency>
-	val expected = <dependencies xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" >
+	val expected = <d>
 		{expectedDep}
-	</dependencies>
+	</d>
+	def dropTopElem(s:String): String = s.split("""\n""").drop(1).dropRight(1).mkString("\n")
 	val pp = new xml.PrettyPrinter(Int.MaxValue, 0)
-	val expectedString = pp.format(expected)
-	val actualString = pp.formatNodes(actual)
+	val expectedString = dropTopElem(pp.format(expected))
+	val actualString = dropTopElem(pp.formatNodes(actual))
 	assert(expectedString == actualString, "Expected dependencies section:\n" + expectedString + "\n\nActual:\n" + actualString)
 }
diff --git a/sbt/src/sbt-test/dependency-management/multiple-classifiers/build.sbt b/sbt/src/sbt-test/dependency-management/multiple-classifiers/build.sbt
index 2e5c53184..3af1b6e6c 100644
--- a/sbt/src/sbt-test/dependency-management/multiple-classifiers/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/multiple-classifiers/build.sbt
@@ -18,12 +18,12 @@ TaskKey[Unit]("check-pom") <<= makePom map { file =>
 			<version>2.8.2</version>
 			<classifier>{classifier}</classifier>
 		</dependency>
-	val sections = depSection("natives-windows") ++ depSection("natives-linux") ++ depSection("natives-osx")
-	val expected = <dependencies xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" >
-		{sections}
-	</dependencies>
+	val sections = <d>
+{depSection("natives-windows") ++ depSection("natives-linux") ++ depSection("natives-osx")}
+</d>
+	def dropTopElem(s:String): String = s.split("""\n""").drop(1).dropRight(1).mkString("\n")
 	val pp = new xml.PrettyPrinter(Int.MaxValue, 0)
-	val expectedString = pp.format(expected)
-	val actualString = pp.formatNodes(actual)
+	val expectedString = dropTopElem(pp.formatNodes(sections))
+	val actualString = dropTopElem(pp.formatNodes(actual))
 	assert(expectedString == actualString, "Expected dependencies section:\n" + expectedString + "\n\nActual:\n" + actualString)
 }