Skip to content

Commit

Permalink
Merge pull request #11003 from ennru/remove-whitesource
Browse files Browse the repository at this point in the history
  • Loading branch information
octonato committed Nov 12, 2021
2 parents 7a3f9d5 + 3bb103a commit 5401361
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
name: published-local-jdk11
paths: "$HOME/.ivy2/local/com.typesafe.play"
- script: scripts/validate-code
name: "Code validations (format, binary compatibilty, whitesource, etc.)"
name: "Code validations (format, binary compatibility, etc.)"
- script: scripts/validate-docs
name: "Validate docs (links, sample code, etc.)"
- script: scripts/validate-microbenchmarks
Expand Down
6 changes: 1 addition & 5 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import interplay.ScalaVersions._
import sbt._
import sbt.Keys._
import sbt.ScriptedPlugin.autoImport._
import sbtwhitesource.WhiteSourcePlugin.autoImport._

import scala.sys.process.stringToProcess
import scala.util.control.NonFatal
Expand Down Expand Up @@ -294,10 +293,7 @@ object BuildSettings {
// For sbt 0.13 this is what we need to avoid publishing. These settings can
// be removed when we move to sbt 1.
PgpKeys.publishSigned := {},
publish := {},
// We also don't need to track dependencies for unpublished projects
// so we need to disable WhiteSource plugin.
whitesourceIgnore := true
publish := {}
)

/** A project that runs in the sbt runtime. */
Expand Down
13 changes: 0 additions & 13 deletions scripts/validate-code
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,3 @@ end mima "VALIDATED BINARY COMPATIBILITY"
start headerCheck "VALIDATE FILE LICENSE HEADERS"
runSbt +headerCheck +test:headerCheck Play-Microbenchmark/test:headerCheck
end headerCheck "VALIDATED FILE LICENSE HEADERS"


start whitesource "RUNNING WHITESOURCE REPORT"
if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
runSbt 'set credentials in ThisBuild += Credentials("whitesource", "whitesourcesoftware.com", "", System.getenv("WHITESOURCE_KEY"))' whitesourceCheckPolicies whitesourceUpdate
else
echo "[info]"
echo "[info] This is a pull request so Whitesource WILL NOT RUN."
echo "[info] It only runs when integrating the code and should not run for PRs. See the page below for details:"
echo "[info] https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions"
echo "[info]"
fi
end whitesource "RUNNING WHITESOURCE REPORT"

0 comments on commit 5401361

Please sign in to comment.