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) => {s}
}
def optionalElem(opt: Boolean) = if(opt) true 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 =>
2.4.1
pom
- val expected =
+ val expected =
{expectedDep}
-
+
+ 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 =>
2.8.2
{classifier}
- val sections = depSection("natives-windows") ++ depSection("natives-linux") ++ depSection("natives-osx")
- val expected =
- {sections}
-
+ val sections =
+{depSection("natives-windows") ++ depSection("natives-linux") ++ depSection("natives-osx")}
+
+ 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)
}