Skip to content

Commit 63893be

Browse files
committed
remove Whitesource
Lightbend no longer uses it, and no replacement has yet been chosen
1 parent aefd360 commit 63893be

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

build.sbt

+2-10
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ val disablePublishing = Seq[Setting[_]](
299299
// The above is enough for Maven repos but it doesn't prevent publishing of ivy.xml files
300300
publish := {},
301301
publishLocal := {},
302-
whitesourceIgnore := true
303302
)
304303

305304
lazy val setJarLocation: Setting[_] =
@@ -429,10 +428,8 @@ lazy val compiler = configureAsSubproject(project)
429428
name := "scala-compiler",
430429
description := "Scala Compiler",
431430
libraryDependencies ++= Seq(antDep, asmDep),
432-
// These are only needed for the POM. (And, note that the jansi dependency is a fiction
433-
// for WhiteSource purposes; the JLine JAR contains a shaded jansi, but WhiteSource
434-
// won't know about that unless we tell it.)
435-
libraryDependencies ++= Seq(scalaXmlDep, jlineDep % "optional", jansiDep % "optional"),
431+
// These are only needed for the POM.
432+
libraryDependencies ++= Seq(scalaXmlDep, jlineDep % "optional"),
436433
buildCharacterPropertiesFile := (Compile / resourceManaged).value / "scala-buildcharacter.properties",
437434
(Compile / resourceGenerators) += generateBuildCharacterPropertiesFile.map(file => Seq(file)).taskValue,
438435
// this a way to make sure that classes from interactive and scaladoc projects
@@ -1334,11 +1331,6 @@ def findJar(files: Seq[Attributed[File]], dep: ModuleID): Option[Attributed[File
13341331
files.find(_.get(moduleID.key).map(extract _) == Some(extract(dep)))
13351332
}
13361333

1337-
// WhiteSource
1338-
whitesourceProduct := "Lightbend Reactive Platform"
1339-
whitesourceAggregateProjectName := "scala-2.12-stable"
1340-
whitesourceIgnoredScopes := Vector("test", "scala-tool")
1341-
13421334
Global / excludeLintKeys := (Global / excludeLintKeys).value ++ Set(scalaSource, javaSource, resourceDirectory)
13431335

13441336
{

project/plugins.sbt

-2
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,3 @@ concurrentRestrictions in Global := Seq(
3333
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0")
3434

3535
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.2")
36-
37-
addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.16")

src/intellij/scala.ipr.SAMPLE

-8
Original file line numberDiff line numberDiff line change
@@ -482,18 +482,10 @@
482482
<root url="jar://$USER_HOME$/.ivy2/cache/org.openjdk.jmh/jmh-generator-asm/jars/jmh-generator-asm-1.19.jar!/" />
483483
<root url="jar://$USER_HOME$/.ivy2/cache/org.openjdk.jmh/jmh-generator-bytecode/jars/jmh-generator-bytecode-1.19.jar!/" />
484484
<root url="jar://$USER_HOME$/.ivy2/cache/org.openjdk.jmh/jmh-generator-reflection/jars/jmh-generator-reflection-1.19.jar!/" />
485-
<root url="jar://$USER_HOME$/.ivy2/cache/org.whitesource/wss-agent-api-client/jars/wss-agent-api-client-2.9.9.02.jar!/" />
486-
<root url="jar://$USER_HOME$/.ivy2/cache/org.whitesource/wss-agent-api/jars/wss-agent-api-2.9.9.02.jar!/" />
487-
<root url="jar://$USER_HOME$/.ivy2/cache/org.whitesource/wss-agent-hash-calculator/jars/wss-agent-hash-calculator-2.9.9.02.jar!/" />
488-
<root url="jar://$USER_HOME$/.ivy2/cache/org.whitesource/wss-agent-report/jars/wss-agent-report-2.9.9.02.jar!/" />
489-
<root url="jar://$USER_HOME$/.ivy2/cache/org.whitesource/wss-agent-utils/jars/wss-agent-utils-2.9.9.02.jar!/" />
490-
<root url="jar://$USER_HOME$/.ivy2/cache/org.whitesource/wss-agent-via-api/jars/wss-agent-via-api-2.9.9.02.jar!/" />
491-
<root url="jar://$USER_HOME$/.ivy2/cache/org.whitesource/pecoff4j/jars/pecoff4j-0.0.2.1.jar!/" />
492485
<root url="jar://$USER_HOME$/.ivy2/cache/pl.project13.scala/sbt-jmh-extras/jars/sbt-jmh-extras-0.4.2.jar!/" />
493486
<root url="jar://$USER_HOME$/.ivy2/cache/scala_2.12/sbt_1.0/com.typesafe/sbt-mima-plugin/jars/sbt-mima-plugin-0.6.1.jar!/" />
494487
<root url="jar://$USER_HOME$/.ivy2/cache/scala_2.12/sbt_1.0/de.heikoseeberger/sbt-header/jars/sbt-header-5.0.0.jar!/" />
495488
<root url="jar://$USER_HOME$/.ivy2/cache/scala_2.12/sbt_1.0/pl.project13.scala/sbt-jmh/jars/sbt-jmh.jar!/" />
496-
<root url="jar://$USER_HOME$/.ivy2/cache/scala_2.12/sbt_1.0/com.lightbend/sbt-whitesource/jars/sbt-whitesource-0.1.16.jar!/" />
497489
</CLASSES>
498490
<JAVADOC />
499491
<SOURCES>

0 commit comments

Comments
 (0)