From 3a0ed6ebcea4c047712b0a6107e4cefca285a6f9 Mon Sep 17 00:00:00 2001 From: Ben McCann Date: Thu, 28 Jan 2016 02:08:33 -0800 Subject: [PATCH] Upgrade to sbt 0.13.11 to grab licenses from parent poms --- project/build.properties | 2 +- src/sbt-test/dumpLicenseReport/default-report/example.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/build.properties b/project/build.properties index 9ad7e84..43b8278 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.8 \ No newline at end of file +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 index acb86c4..2b2eafe 100644 --- 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)