From ca3fa778d656bcdff11b4e86628690a07d87db0a Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 20 Nov 2017 13:25:17 +0100 Subject: [PATCH] Check all dependencies, except NoPublish ones, fail on error (#24021) --- project/AkkaBuild.scala | 1 - project/Publish.scala | 4 +++- project/Whitesource.scala | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index ec08851e49..7a4c309326 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -10,7 +10,6 @@ import java.util.Properties import com.typesafe.sbt.pgp.PgpKeys.publishSigned import sbt.Keys._ import sbt._ -import sbtwhitesource.WhiteSourcePlugin.autoImport.whitesourceIgnore import scala.collection.breakOut object AkkaBuild { diff --git a/project/Publish.scala b/project/Publish.scala index b7bec705de..8401c2b186 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -6,6 +6,7 @@ package akka import sbt._ import sbt.Keys._ import java.io.File +import sbtwhitesource.WhiteSourcePlugin.autoImport.whitesourceIgnore object Publish extends AutoPlugin { @@ -62,7 +63,8 @@ object NoPublish extends AutoPlugin { override def projectSettings = Seq( skip in publish := true, - sources in (Compile, doc) := Seq.empty + sources in (Compile, doc) := Seq.empty, + whitesourceIgnore := true ) } diff --git a/project/Whitesource.scala b/project/Whitesource.scala index d83aba7650..acafe4ba3e 100644 --- a/project/Whitesource.scala +++ b/project/Whitesource.scala @@ -20,5 +20,8 @@ object Whitesource extends AutoPlugin { if (gitCurrentBranch.value == "master") "master" else "adhoc" else majorMinor((version in LocalRootProject).value).map(_ + "-stable").getOrElse("adhoc")) - }) + }, + whitesourceForceCheckAllDependencies := true, + whitesourceFailOnError := true, + ) }