Merge pull request #24 from benmccann/sbt-0.13.10

Upgrade to sbt 0.13.11 in order to correctly get info from parent poms
sbt · Feb 25, 2016 · 744a645 · 744a645
2 parents f62349c + 3a0ed6e
commit 744a645
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.11
diff --git a/src/sbt-test/dumpLicenseReport/default-report/example.sbt b/src/sbt-test/dumpLicenseReport/default-report/example.sbt
@@ -6,8 +6,8 @@ excludeDependencies += SbtExclusionRule(organization = "org.scala-lang")
 
 TaskKey[Unit]("check") := {
   val contents = sbt.IO.read(target.value / "license-reports" / "example-licenses.md")
-  if (!contents.contains("jackson-databind"))
-    sys.error("Expected report to contain jackson-databind: " + contents)
+  if (!contents.contains("[The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) | com.fasterxml.jackson.core # jackson-databind # 2.5.4"))
+    sys.error("Expected report to contain jackson-databind with Apache license: " + contents)
   // Test whether exclusions are included.
   if (contents.contains("scala-library"))
     sys.error("Expected report to NOT contain scala-library: " + contents)