From 71c9ec0e553152b5bf7148bd96ca6edb41560e98 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Mon, 3 Mar 2014 10:20:15 -0500 Subject: [PATCH] Adding quick test for #1136. * Just checks to see if + in version numbers are removed from pom files. --- .../make-pom/project/MakePomTest.scala | 14 +++++++++++++- .../sbt-test/dependency-management/make-pom/test | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala b/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala index 961edec25..342c4cf42 100644 --- a/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala +++ b/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala @@ -8,8 +8,10 @@ object MakePomTest extends Build readPom <<= makePom map XML.loadFile, TaskKey[Unit]("check-pom") <<= checkPom, TaskKey[Unit]("check-extra") <<= checkExtra, + TaskKey[Unit]("check-version-plus-mapping") <<= checkVersionPlusMapping, resolvers += Resolver.sonatypeRepo("snapshots"), - makePomConfiguration ~= { _.copy(extra = ) } + makePomConfiguration ~= { _.copy(extra = ) }, + libraryDependencies += "com.google.code.findbugs" % "jsr305" % "1.3.+" ) val readPom = TaskKey[Elem]("read-pom") @@ -33,6 +35,16 @@ object MakePomTest extends Build if(extra.isEmpty) error("'" + extraTagName + "' not found in generated pom.xml.") else () } + lazy val checkVersionPlusMapping = (readPom) map { (pomXml) => + var found = false + for { + dep <- pomXml \ "dependencies" \ "dependency" + if (dep \ "artifactId").text == "jsr305" + if (dep \ "version").text contains "+" + } sys.error(s"Found dependency with invalid maven version: $dep") + () + } + lazy val checkPom = (readPom, fullResolvers) map { (pomXML, ivyRepositories) => checkProject(pomXML) withRepositories(pomXML) { repositoriesElement => diff --git a/sbt/src/sbt-test/dependency-management/make-pom/test b/sbt/src/sbt-test/dependency-management/make-pom/test index 3d7f79218..4e3cfe973 100644 --- a/sbt/src/sbt-test/dependency-management/make-pom/test +++ b/sbt/src/sbt-test/dependency-management/make-pom/test @@ -1,2 +1,3 @@ > check-pom -> check-extra \ No newline at end of file +> check-extra +> check-version-plus-mapping \ No newline at end of file