diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40b17cf4d..cf09702f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,6 @@ jobs: ./sbt -v --client serverTestProj/scalafmtCheckAll ./sbt -v --client headerCheck ./sbt -v --client "Test/headerCheck" - ./sbt -v --client whitesourceOnPush ./sbt -v --client "Test/compile" ./sbt -v --client publishLocal ./sbt -v --client test diff --git a/build.sbt b/build.sbt index 42a77a8a3..138910013 100644 --- a/build.sbt +++ b/build.sbt @@ -50,7 +50,6 @@ Global / semanticdbVersion := "4.5.9" val excludeLint = SettingKey[Set[Def.KeyedInitialize[_]]]("excludeLintKeys") Global / excludeLint := (Global / excludeLint).?.value.getOrElse(Set.empty) Global / excludeLint += componentID -Global / excludeLint += whitesourceIgnoredScopes Global / excludeLint += scriptedBufferLog Global / excludeLint += checkPluginCross @@ -1454,15 +1453,6 @@ def customCommands: Seq[Setting[_]] = Seq( s"""set scalaVersion in ThisBuild := "$scala212" """ :: state }, - commands += Command.command("whitesourceOnPush") { state => - sys.env.get("TRAVIS_EVENT_TYPE") match { - case Some("push") => - "whitesourceCheckPolicies" :: - "whitesourceUpdate" :: - state - case _ => state - } - }, commands += Command.command("release-sbt-local") { state => "clean" :: "so compile" :: @@ -1519,24 +1509,3 @@ ThisBuild / publishTo := { Some("releases" at nexus + "service/local/staging/deploy/maven2") } ThisBuild / publishMavenStyle := true -ThisBuild / whitesourceProduct := "Lightbend Reactive Platform" -ThisBuild / whitesourceAggregateProjectName := { - // note this can get detached on tag build etc - val b = sys.process.Process("git rev-parse --abbrev-ref HEAD").!!.trim - val Stable = """1\.([0-9]+)\.x""".r - b match { - case Stable(y) => "sbt-1." + y.toString + "-stable" - case _ => "sbt-master" - } -} -ThisBuild / whitesourceAggregateProjectToken := { - (ThisBuild / whitesourceAggregateProjectName).value match { - case "sbt-master" => "e7a1e55518c0489a98e9c7430c8b2ccd53d9f97c12ed46148b592ebe4c8bf128" - case "sbt-1.3-stable" => "7e38cbb4d2fc4599835cd5d2cfb41b150597a4147b15424bb65841664ab2ec0d" - case "sbt-1.2-stable" => "54f2313767aa47198971e65595670ee16e1ad0000d20458588e72d3ac2c34763" - case _ => "" // it's ok to fail here - } -} -ThisBuild / whitesourceIgnoredScopes ++= Seq("plugin", "scalafmt", "sxr") -ThisBuild / whitesourceFailOnError := sys.env.contains("WHITESOURCE_PASSWORD") // fail if pwd is present -ThisBuild / whitesourceForceCheckAllDependencies := true diff --git a/project/plugins.sbt b/project/plugins.sbt index 7f677b694..28508259b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,6 @@ addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.0") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.1") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.5") -addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.14") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1") addSbtPlugin("com.swoval" % "sbt-java-format" % "0.3.1")