Remove WhiteSource plugin (#30545)

This commit is contained in:
Peter Vlugter 2021-08-17 19:04:27 +12:00 committed by GitHub
parent f7521f0587
commit bbb9f10d1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 66 deletions

View file

@ -34,9 +34,7 @@ jobs:
-Dakka.test.metrics.reporter.graphite.prefix=jenkins \ -Dakka.test.metrics.reporter.graphite.prefix=jenkins \
-Dakka.test.metrics.reporter.graphite.host=54.72.154.120 \ -Dakka.test.metrics.reporter.graphite.host=54.72.154.120 \
-Dakka.sbt.statsd=false \ -Dakka.sbt.statsd=false \
clean update whitesourceUpdate whitesourceCheckPolicies test:compile test publishLocal publishM2 clean update test:compile test publishLocal publishM2
env:
WHITESOURCE_PASSWORD: ${{ secrets.WHITESOURCE_PASSWORD }}
- name: Email on failure - name: Email on failure
if: ${{ failure() }} if: ${{ failure() }}

View file

@ -27,11 +27,9 @@ jobs:
run: |- run: |-
sudo apt-get install graphviz sudo apt-get install graphviz
sbt +mimaReportBinaryIssues sbt +mimaReportBinaryIssues
sbt whitesourceCheckPolicies
sbt ci-release sbt ci-release
env: env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }} PGP_SECRET: ${{ secrets.PGP_SECRET }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
WHITESOURCE_PASSWORD: ${{ secrets.WHITESOURCE_PASSWORD }}

View file

@ -33,23 +33,13 @@ cache:
# script for the default 'test' stage: # script for the default 'test' stage:
script: sbt -jvm-opts .jvmopts-ci -Dakka.build.scalaVersion=$TRAVIS_SCALA_VERSION ";update ;mimaReportBinaryIssues ;test:compile ;validateCompile ;headerCheckAll" script: sbt -jvm-opts .jvmopts-ci -Dakka.build.scalaVersion=$TRAVIS_SCALA_VERSION ";update ;mimaReportBinaryIssues ;test:compile ;validateCompile ;headerCheckAll"
jobs:
include:
- stage: whitesource
name: whitesource
script: git branch -f "$TRAVIS_BRANCH" && git checkout "$TRAVIS_BRANCH" && sbt whitesourceCheckPolicies whitesourceUpdate
stages: stages:
- name: whitesource
if: repo = akka/akka AND ((branch = master AND type != pull_request) OR tag =~ ^v)
- name: test - name: test
if: type == pull_request OR NOT tag =~ ^v if: type == pull_request OR NOT tag =~ ^v
env: env:
global: global:
- TRAVIS_JDK=8 - TRAVIS_JDK=8
# encrypt with: travis encrypt --pro WHITESOURCE_PASSWORD=...
- secure: "hY52m7mKMUO8Lm4WS2IMIEXyMpHVBC2wt6zGaQg0w3/kTotteQmeUW5PZnbepepUZaOTxrWXMBvnyzLAnGRW6VfmViuTaaT86jsZFqlc1y4hTmG5oB6VWSDHvbXpupUd54l4Ks8IrWNsJ1nQI+rlxYYz8oRAdVSsi59K+KKEFX6Ucff9UK9pgOA6fVftxQsxFPTJaseqb80UVhM37Y582CpH5T31MEpGUPA7URBe486saURRs3OmAeiPgwinY/f2Fr8BwCPrEfaJHv2Ks+yxj7iWFuCKkGbOmd+TJjK3AbFqYmV+uYbSsI9p5wkb0ciW708jbeV7qk5V/OSohxucHF5ivI0yMS8RWscL0TpMRHlZPkvzpPhUCdYBMaiztmaFrYdlkjicNVXnV+4Mk0zAc3sdg3WoV9eRg1JmRxgSGVRJeIKUXy3rWjdVoGjgeG9J4cm7Ge+k3cEgbT11+gY6PhcmMYXwGwXvAtWD4/iGeZOE7JXsSeFdlA+vYIscz4N/mcm27K7BLPpv5+SRJaAp3sAj1hS/ePJWPcbCRdRuxGMfk3X4BxesbR6AL9TinrH6R3L7DkRhH524eE0Ph50Wmc1+oBts3wLvPyNYv6fDN7JyUFnArp2mh+ByAzaf0wX+2FPNoL1C3MC0jtcbbzAhZlQMZ6NbbcGgL1XiRKb0Eks="
# safelist # safelist
branches: branches:

View file

@ -43,11 +43,6 @@ When releasing from Windows, you need MinGW and a gpg distribution such as Gpg4W
Make sure you have set `core.autocrlf` to `false` in your `~/.gitconfig`, Make sure you have set `core.autocrlf` to `false` in your `~/.gitconfig`,
otherwise git might convert line endings in some cases. otherwise git might convert line endings in some cases.
### Whitesource
Make sure you have the Lightbend Whitesource credentials configured in
your `~/.sbt/1.0/private-credentials.sbt`.
### Install Graphviz ### Install Graphviz
[Graphvis](https://graphviz.gitlab.io/download/) is needed for the [Graphvis](https://graphviz.gitlab.io/download/) is needed for the

View file

@ -131,7 +131,7 @@ lazy val actorTests = akkaModule("akka-actor-tests")
.dependsOn(testkit % "compile->compile;test->test") .dependsOn(testkit % "compile->compile;test->test")
.settings(Dependencies.actorTests) .settings(Dependencies.actorTests)
.enablePlugins(NoPublish) .enablePlugins(NoPublish)
.disablePlugins(MimaPlugin, WhiteSourcePlugin) .disablePlugins(MimaPlugin)
lazy val akkaScalaNightly = akkaModule("akka-scala-nightly") lazy val akkaScalaNightly = akkaModule("akka-scala-nightly")
.aggregate(aggregatedProjects: _*) .aggregate(aggregatedProjects: _*)
@ -145,7 +145,7 @@ lazy val benchJmh = akkaModule("akka-bench-jmh")
.settings(Dependencies.benchJmh) .settings(Dependencies.benchJmh)
.settings(javacOptions += "-parameters") // for Jackson .settings(javacOptions += "-parameters") // for Jackson
.enablePlugins(JmhPlugin, ScaladocNoVerificationOfDiagrams, NoPublish, CopyrightHeader) .enablePlugins(JmhPlugin, ScaladocNoVerificationOfDiagrams, NoPublish, CopyrightHeader)
.disablePlugins(MimaPlugin, WhiteSourcePlugin, ValidatePullRequest, CopyrightHeaderInPr) .disablePlugins(MimaPlugin, ValidatePullRequest, CopyrightHeaderInPr)
lazy val cluster = akkaModule("akka-cluster") lazy val cluster = akkaModule("akka-cluster")
.dependsOn( .dependsOn(
@ -255,7 +255,7 @@ lazy val docs = akkaModule("akka-docs")
ScaladocNoVerificationOfDiagrams, ScaladocNoVerificationOfDiagrams,
StreamOperatorsIndexGenerator, StreamOperatorsIndexGenerator,
Jdk9) Jdk9)
.disablePlugins(MimaPlugin, WhiteSourcePlugin) .disablePlugins(MimaPlugin)
.disablePlugins((if (ScalafixSupport.fixTestScope) Nil else Seq(ScalafixPlugin)): _*) .disablePlugins((if (ScalafixSupport.fixTestScope) Nil else Seq(ScalafixPlugin)): _*)
lazy val jackson = akkaModule("akka-serialization-jackson") lazy val jackson = akkaModule("akka-serialization-jackson")
@ -307,7 +307,7 @@ lazy val persistenceShared = akkaModule("akka-persistence-shared")
.settings(AutomaticModuleName.settings("akka.persistence.shared")) .settings(AutomaticModuleName.settings("akka.persistence.shared"))
.settings(Test / fork := true) .settings(Test / fork := true)
.enablePlugins(NoPublish) .enablePlugins(NoPublish)
.disablePlugins(MimaPlugin, WhiteSourcePlugin) .disablePlugins(MimaPlugin)
lazy val persistenceTck = akkaModule("akka-persistence-tck") lazy val persistenceTck = akkaModule("akka-persistence-tck")
.dependsOn(persistence % "compile->compile;test->test", testkit % "compile->compile;test->test") .dependsOn(persistence % "compile->compile;test->test", testkit % "compile->compile;test->test")
@ -414,7 +414,7 @@ lazy val remoteTests = akkaModule("akka-remote-tests")
.settings(Test / parallelExecution := false) .settings(Test / parallelExecution := false)
.configs(MultiJvm) .configs(MultiJvm)
.enablePlugins(MultiNodeScalaTest, NoPublish) .enablePlugins(MultiNodeScalaTest, NoPublish)
.disablePlugins(MimaPlugin, WhiteSourcePlugin) .disablePlugins(MimaPlugin)
lazy val slf4j = akkaModule("akka-slf4j") lazy val slf4j = akkaModule("akka-slf4j")
.dependsOn(actor, testkit % "test->test") .dependsOn(actor, testkit % "test->test")
@ -441,7 +441,7 @@ lazy val streamTests = akkaModule("akka-stream-tests")
.dependsOn(streamTestkit % "test->test", remote % "test->test", stream % "TestJdk9->CompileJdk9") .dependsOn(streamTestkit % "test->test", remote % "test->test", stream % "TestJdk9->CompileJdk9")
.settings(Dependencies.streamTests) .settings(Dependencies.streamTests)
.enablePlugins(NoPublish, Jdk9) .enablePlugins(NoPublish, Jdk9)
.disablePlugins(MimaPlugin, WhiteSourcePlugin) .disablePlugins(MimaPlugin)
lazy val streamTestsTck = akkaModule("akka-stream-tests-tck") lazy val streamTestsTck = akkaModule("akka-stream-tests-tck")
.dependsOn(streamTestkit % "test->test", stream) .dependsOn(streamTestkit % "test->test", stream)
@ -453,7 +453,7 @@ lazy val streamTestsTck = akkaModule("akka-stream-tests-tck")
// to run with small heap without G1. // to run with small heap without G1.
Test / fork := true) Test / fork := true)
.enablePlugins(NoPublish) .enablePlugins(NoPublish)
.disablePlugins(MimaPlugin, WhiteSourcePlugin) .disablePlugins(MimaPlugin)
lazy val testkit = akkaModule("akka-testkit") lazy val testkit = akkaModule("akka-testkit")
.dependsOn(actor) .dependsOn(actor)

View file

@ -7,7 +7,6 @@ package akka
import sbt._ import sbt._
import sbt.Keys._ import sbt.Keys._
import java.io.File import java.io.File
import sbtwhitesource.WhiteSourcePlugin.autoImport.whitesourceIgnore
import com.lightbend.sbt.publishrsync.PublishRsyncPlugin.autoImport.publishRsyncHost import com.lightbend.sbt.publishrsync.PublishRsyncPlugin.autoImport.publishRsyncHost
import xerial.sbt.Sonatype.autoImport.sonatypeProfileName import xerial.sbt.Sonatype.autoImport.sonatypeProfileName
@ -58,5 +57,5 @@ object NoPublish extends AutoPlugin {
override def requires = plugins.JvmPlugin override def requires = plugins.JvmPlugin
override def projectSettings = override def projectSettings =
Seq(publish / skip := true, Compile / doc / sources := Seq.empty, whitesourceIgnore := true) Seq(publish / skip := true, Compile / doc / sources := Seq.empty)
} }

View file

@ -1,36 +0,0 @@
/*
* Copyright (C) 2018-2021 Lightbend Inc. <https://www.lightbend.com>
*/
import sbt._
import sbt.Keys._
import sbtwhitesource.WhiteSourcePlugin.autoImport._
import sbtwhitesource._
import scala.sys.process._
object Whitesource extends AutoPlugin {
override def requires = WhiteSourcePlugin
override def trigger = allRequirements
override lazy val projectSettings = Seq(
// do not change the value of whitesourceProduct
whitesourceProduct := "Lightbend Reactive Platform",
whitesourceAggregateProjectName := {
val name = (LocalRootProject / moduleName).value
val wsVersionName =
if (isSnapshot.value) {
val currentGitBranch = "git rev-parse --abbrev-ref HEAD".!!.trim
if (currentGitBranch == "master") "master"
else "adhoc"
} else
CrossVersion
.partialVersion((LocalRootProject / version).value)
.map { case (major, minor) => s"$major.$minor-stable" }
.getOrElse("adhoc")
s"$name-$wsVersionName"
},
whitesourceForceCheckAllDependencies := true,
whitesourceFailOnError := true)
}

View file

@ -21,7 +21,6 @@ addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1") addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.39") addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.39")
addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.18")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("com.hpe.sbt" % "sbt-pull-request-validator" % "1.0.0") addSbtPlugin("com.hpe.sbt" % "sbt-pull-request-validator" % "1.0.0")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.28") addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.28")