Skip to content

Commit

Permalink
Licsense checks: remove use of Whitesource (#2722)
Browse files Browse the repository at this point in the history
  • Loading branch information
ennru authored Sep 27, 2021
1 parent 1783bda commit c76657c
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 81 deletions.
14 changes: 4 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ jobs:
- name: unix-domain-socket
- name: xml

- stage: whitesource
script: git branch -f "$TRAVIS_BRANCH" && git checkout "$TRAVIS_BRANCH" && sbt -sbt-launch-repo https://repo1.maven.org/maven2 whitesourceCheckPolicies whitesourceUpdate whitesourceSupported/whitesourceUpdate
- stage: licenses
script: echo "License checking is temporarily disabled"

- name: "Publish artifacts for Scala 2.12 and 2.13"
env: CMD="ci-release"
Expand All @@ -171,7 +171,7 @@ stages:
if: NOT tag =~ ^v

# runs on main repo master commits or version-tagged commits
- name: whitesource
- name: licenses
if: repo = akka/alpakka AND ( ( branch = master AND type = push ) OR tag =~ ^v )

# runs on main repo master commits or version-tagged commits
Expand All @@ -197,12 +197,6 @@ cache:
env:
global:
- RUN_DROP_TRAVIS_CACHES_STAGE=true
# encrypt with: travis encrypt WHITESOURCE_PASSWORD=...
- secure: "VpRSxeqP6gXCxnYCsjylMt1xxXxI/hlj6msibKuHpstDnfPkbDMS8RnRJ/39tyjx/szELZSzAllV0VpM27JpTXlKfIT/78ZUGcljqzfnmv3uh/dWh9k2ERQX1Hr3TGFFyljIbEKHcHjvgHBJtlIRGIuvoBv0tJ98pcqS6dCeplaaJa1Ya7Q53u17GOJakhvTjrT3ASz8gF1kV4GN9XhQCUjRfQSINiT+QC+ONoHy6ztZPIDgfUskBfKgZU5P1saDLcBjzBkXDWIwbKubfJGBl3DSs2fHaWNJE5CRZNJ64Wi8Hs006zvyomIaCfbVAWtxOiLCdXxlys/YQs43RRB0pBqyvTpxH4lEwnLR5uGDH+nuBQw9efCWqsM3CDsRSH7iobjBlunKgDCfjua5/dWJ3Wm2j8WOi6C6/y/YrGwU/DrncukRtcyKj92Mu3LHk5HEMiOiIA41P2NTqalvjvoqi1zMQ5On2g55e2YMcHmQ8dCsRAgegCYB3a6GyGq7T8zkuMMljpmpQJwayrJPQKi001d3ajZZwMLcv4YW9ndVYCZD9ducZ448Uo5BCpJFDPPG+xcXrvZowCUA9JtpnyXrTcTLvFITG2egXyLOQfZ0/FX9XneMtX8qX8ysHaBX9tWiYsplo/WfbpBHy935Ag8WnGH0cYvOXuqAKKUXRVq9ANI="
# encrypt with: travis encrypt BINTRAY_USER=...
- secure: "hnaw+GZ6kwf2TaJrdw7CMzt61Kh3gW0DVswrk0dFWvwEZkoXmjmdEOOITu/zucI9KfRZPV3fCwkYGhZKgstquW7vB8OfueLBUOZyNtx51oTCAlUztx1pKHjm5r3yDU+oO5RSaovH0qcV5dsJq0Gu7b+HWesohWSAproZsiu69oCRFqgNctNAwrZvqL8e+mXiSuKnRWcLQUof5MSgKcYdZ029muGlbh7fhjS9zewfURIROgVEXixCgYvBuhWcyNPzl8rhzxbXuvUx6BZ9bR0msl5imG4MNy/PfYw/xYDtrelPiVWMuHcjNQq5xyvQTj1W5M4Mn2R+3VNXRPPxifFw9TlTdU7GrmEZe6b2Apymy0gTXBntAqWHyA8/qhaqms8sZmxafAdx+YzHMbSkKnORY92jSPJ43hINSRBwotmL0GXzIpIM0wm2qKkW7+BAGi728wuotnS5NFudlm2w5nbIY8rQ+pP5/U5Ur3KFEpQ6cvW4u6jLFB3WxyOI0NSVWsplcq38SxrCyJxyh2mGXVMSWqDX0rj5gFGk2lnjZGRE1IN5CFgiHgW858K7IoTBAwuCLpeDnEaUBti3WUTOew56mbuEixawX+zGyD5Y2mhiGxXZ1HmeIdFT9W0O2jriFWo7t7NR/MSsIg3xh6WdfBCwhklZbrSXMrlA5Hm1JMriYyo="
# encrypt with: travis encrypt BINTRAY_PASS=...
- secure: "kra9cxN+5Ya6CEtEs1ry94uGOHDhVoQmJs7B700Jk4qYXu3tdPPDVt4lNheQvu/TGoTRDZecHymC526eiZTcJh7/87CAC2SYu+YW7lMP3NBcHaqnxuSWzXVNyiRjgCEWAy/pcDhGkJwL6LgNg5Vho09bV62SuySYZQ8K1QBeKIks0oZrYVIXqXborYfZ+FzSvVoOEOoEp5V1Uv98deTcfDzsqtLOXker0t6iLPIYAJA7vpNGfWk6aRqa3W1I73ojhVvcL5BqB6RK95meEJfaqclftObmp4m0aWNQujHzQIydw22rF9Sc7PAy67p2Pf28KLZPEuZYAx5KWeAYwO5rblqgvDR5hR1CqrACscl1FSpFFQMrAig+dLgHdOOAzBMGu1qqQPv/Muj2Mm4MXn7NLRdaxSRQbq4LleqUpADjEXP+LGkLjFwFHGsgNa3dNppSoeO1gvBBl4YcOCdAM8Io89M7VR7SOE3BVxDYwSJruqLcm/8nQ35CHigOm+HT03jNwY7ypgUPreHpJ5d9qFz+uRwSBSnHsHNampiydRVOjH8x0+UEPlzQ4/nYjHTJAk0Ru1CEDaUg5OFqOqdzPaplS4Yg2zpAJTSgVxh5Yr+O3KGTyapSX6wXP3LY728L1g3H0VNFGQ67TEVkXVO62rlw+1jltXLLxnp7/UhWFn02f04="
# encrypt with: travis encrypt SONATYPE_USERNAME=...
- secure: "b2zZTu9oo5fpP9GFDBzR/kpFEvTJW7GfSpu4ceqEEB2/Cr3npSPfHCplsYCmI8nXCg+XHkcd1pE3/K7z7DQtg9rHqR7mGBdOn2/YQ+myOZhZdUceomg11tFNZZW91qDRo1vWqZ7GSgkkDIuK42JCOhDaUBOdCN6LVQZypHvzL2VIkXemRgedmBS+2GEkAofIyi4Ny8ZiCtkUb+H7XSdvxyG76/XfPXAdNZuI0sEGByEGeTgEQzgmOxjgA+qsiyzPJXDz0A7qWRGlMlqJ2UQS4OVP0Stsc+c/fd15qA9LIprot2ujmwuY3athvxqeag0OorI7CnMeLJyao1ZnljUEAyPW4irWGe/z1yByOfpu7TPOJh55GJTqAoD1IPpsAfOuNCgJ2R6+TIUx8H90TTsLonRDps575D/W/psp3L4kZGYfry4FNGbPbyNPndUOuAY1f7P7Lpzx6d7RHdtI5SvGOskSWvJ3v5rUjiRdGfXfvsugSyCOfnAY4mK/wYbGlfS2Hxi/58wZOGo7HkUnaj4akOeRcqEn552s6GpE5X9bqO4EZf6BCRrcStFTm0V7wk7zYtQwc2qpy0evcFpV59R2yPPvx1HUF0GbVR0jbxeTcwpzHwJSRsHg6W2YTJG+RwDs6FU1HsnXFSJcB7o0UotHk2qZwUbTfQHozpOBBHoVQp4="
# encrypt with: travis encrypt SONATYPE_PASSWORD=...
Expand All @@ -213,6 +207,6 @@ env:
branches:
only:
- master
- release-2.0
- release-3.0
# allow release tags
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,5 @@ Example:
1. [Travis CI](https://travis-ci.com/akka/alpakka) automatically merges the code, builds it, runs the tests and sets Pull Request status accordingly of results in GitHub.
1. [Scalafmt](http://scalameta.org/scalafmt/) enforces some of the code style rules.
1. [sbt-header plugin](https://github.com/sbt/sbt-header) manages consistent copyright headers in every source file.
1. The [sbt-whitesourece plugin](https://github.com/lightbend/sbt-whitesource) checks licensing models of all (transitive) dependencies.
1. A GitHub bot checks whether you've signed the Lightbend CLA.
1. Enabling `fatalWarnings := true` for all projects.
17 changes: 2 additions & 15 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import Whitesource.whitesourceGroup

lazy val alpakka = project
.in(file("."))
.enablePlugins(ScalaUnidocPlugin)
Expand Down Expand Up @@ -124,9 +122,9 @@ lazy val cassandra =
alpakkaProject("cassandra", "cassandra", Dependencies.Cassandra)

lazy val couchbase =
alpakkaProject("couchbase", "couchbase", Dependencies.Couchbase, whitesourceGroup := Whitesource.Group.Supported)
alpakkaProject("couchbase", "couchbase", Dependencies.Couchbase)

lazy val csv = alpakkaProject("csv", "csv", whitesourceGroup := Whitesource.Group.Supported)
lazy val csv = alpakkaProject("csv", "csv")

lazy val csvBench = internalProject("csv-bench")
.dependsOn(csv)
Expand Down Expand Up @@ -307,7 +305,6 @@ lazy val docs = project
.settings(
Compile / paradox / name := "Alpakka",
publish / skip := true,
whitesourceIgnore := true,
makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value,
previewPath := (Paradox / siteSubdirName).value,
Preprocess / siteSubdirName := s"api/alpakka/${projectInfoVersion.value}",
Expand Down Expand Up @@ -390,22 +387,12 @@ lazy val docs = project

lazy val testkit = internalProject("testkit", Dependencies.testkit)

lazy val whitesourceSupported = project
.in(file("tmp"))
.settings(whitesourceGroup := Whitesource.Group.Supported)
.aggregate(
cassandra,
couchbase,
csv
)

lazy val `doc-examples` = project
.enablePlugins(AutomateHeaderPlugin)
.disablePlugins(MimaPlugin, SitePlugin)
.settings(
name := s"akka-stream-alpakka-doc-examples",
publish / skip := true,
whitesourceIgnore := true,
// More projects are not available for Scala 2.13
crossScalaVersions -= Dependencies.Scala213,
Dependencies.`Doc-examples`,
Expand Down
2 changes: 1 addition & 1 deletion contributor-advice.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Which licenses are compatible with Apache 2 are defined in [this doc](http://www

> Each license in this category requires some degree of [reciprocity](http://www.apache.org/legal/3party.html#define-reciprocal); therefore, additional action must be taken in order to minimize the chance that a user of an Apache product will create a derivative work of a reciprocally-licensed portion of an Apache product without being aware of the applicable requirements.
Dependency licenses will be checked automatically by the sbt Whitesource plug-in.
Dependency licenses will be checked automatically by [FOSSA](https://fossa.com/).

### Packages & Scoping

Expand Down
2 changes: 0 additions & 2 deletions docs/release-train-issue-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ Key links:

### Preparing release notes in the documentation / announcement

- [ ] For non-patch releases: rename the 'alpakka-x.x-stable' and 'alpakka-supported-x.x-stable' reporting projects in [WhiteSource](https://saas.whitesourcesoftware.com/Wss/WSS.html#!project;id=517292) accordingly (unfortunately this requires permissions that cannot be shared outside of Lightbend)
- [ ] Check readiness levels in `/project/project-info.conf`, and put in the release date for any new modules
- [ ] Check supported projects listing in `whitesourceSupported`
- [ ] Use the [draft release notes](https://github.com/akka/alpakka/releases) to create/update the release notes in `docs/src/main/paradox/release-notes/`, listing contributors generated by [`sbt-authors`](https://github.com/2m/authors) (eg. `sbt "authors v1.1.0 HEAD"`)
- [ ] For non-patch releases: Create a news item draft PR on [akka.github.com](https://github.com/akka/akka.io), using the milestone
- [ ] Move all [unclosed issues](https://github.com/akka/alpakka/issues?q=is%3Aopen+is%3Aissue+milestone%3A$VERSION$) for this milestone to the next milestone
Expand Down
6 changes: 3 additions & 3 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import org.scalafmt.sbt.ScalafmtPlugin.autoImport._
import de.heikoseeberger.sbtheader._
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
import com.lightbend.paradox.projectinfo.ParadoxProjectInfoPluginKeys._
import Whitesource.whitesourceGroup
import com.typesafe.tools.mima.plugin.MimaKeys._
import xerial.sbt.Sonatype.autoImport.sonatypeProfileName

Expand Down Expand Up @@ -35,12 +34,13 @@ object Common extends AutoPlugin {
// TODO https://github.com/akka/alpakka/issues/2456
// fatalWarnings := true,
fatalWarnings := false,
mimaReportSignatureProblems := true
mimaReportSignatureProblems := true,
// Ignore unused keys which affect documentation
excludeLintKeys ++= Set(scmInfo, projectInfoVersion, autoAPIMappings)
)

override lazy val projectSettings = Dependencies.Common ++ Seq(
projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value),
whitesourceGroup := Whitesource.Group.Community,
crossVersion := CrossVersion.binary,
crossScalaVersions := Dependencies.ScalaVersions,
scalaVersion := Dependencies.Scala212,
Expand Down
48 changes: 0 additions & 48 deletions project/Whitesource.scala

This file was deleted.

1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.6")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0")
addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.18")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.5.1")
// docs
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.37")
Expand Down

0 comments on commit c76657c

Please sign in to comment.