|
1 | | -import akka.Dependencies.{ allScalaVersions, fortifySCAVersion, scalaFortifyVersion } |
| 1 | +import akka.Dependencies.allScalaVersions |
2 | 2 | import akka.{ AutomaticModuleName, CopyrightHeaderForBuild, Paradox } |
3 | 3 | import com.geirsson.CiReleasePlugin |
4 | 4 |
|
@@ -546,29 +546,11 @@ lazy val billOfMaterials = Project("akka-bill-of-materials", file("akka-bill-of- |
546 | 546 | bomIncludeProjects := userProjects, |
547 | 547 | description := s"${description.value} (depending on Scala ${CrossVersion.binaryScalaVersion(scalaVersion.value)})") |
548 | 548 |
|
549 | | -lazy val doesFortifyLicenseExist: Boolean = { |
550 | | - import java.nio.file.Files |
551 | | - val home = System.getProperty("user.home") |
552 | | - val fortifyLicense = new File(s"$home/.lightbend/fortify.license") |
553 | | - Files.exists(fortifyLicense.toPath) |
554 | | -} |
555 | | - |
556 | | -def fortifySettings(name: String) = { |
557 | | - if (doesFortifyLicenseExist) { |
558 | | - Seq( |
559 | | - addCompilerPlugin(("com.lightbend" %% "scala-fortify" % scalaFortifyVersion).cross(CrossVersion.patch)), |
560 | | - scalacOptions ++= Seq(s"-P:fortify:scaversion=$fortifySCAVersion", s"-P:fortify:build=$name")) |
561 | | - } else { |
562 | | - Seq() |
563 | | - } |
564 | | -} |
565 | | - |
566 | 549 | def akkaModule(name: String): Project = |
567 | 550 | Project(id = name, base = file(name)) |
568 | 551 | .enablePlugins(ReproducibleBuildsPlugin) |
569 | 552 | .settings(akka.AkkaBuild.buildSettings) |
570 | 553 | .settings(akka.AkkaBuild.defaultSettings) |
571 | | - .settings(fortifySettings(name)) |
572 | 554 | .enablePlugins(BootstrapGenjavadoc) |
573 | 555 | .disablePlugins(CiReleasePlugin) // we use publishSigned, but use a pgp utility from CiReleasePlugin |
574 | 556 |
|
@@ -605,19 +587,3 @@ addCommandAlias( |
605 | 587 | commandValue(clusterShardingTyped), |
606 | 588 | commandValue(persistenceTyped), |
607 | 589 | commandValue(streamTyped)).mkString) |
608 | | - |
609 | | -// Convenience task allowing all Fortify steps to be done in the sbt shell |
610 | | -lazy val analyzeSource = taskKey[Unit]("Analyzing NST files emitted by Fortify SCA") |
611 | | -analyzeSource := { |
612 | | - val s = streams.value |
613 | | - val shell = Seq("bash", "-c") |
614 | | - val scan = shell :+ s"./scripts/runSourceAnalyzer.sh $fortifySCAVersion" |
615 | | - if (doesFortifyLicenseExist) { |
616 | | - s.log.info("Analyzing NST files emitted by Fortify SCA.") |
617 | | - scan ! |
618 | | - } else { |
619 | | - s.log.info("Fortify license not found so NST files creation was skipped.") |
620 | | - } |
621 | | -} |
622 | | - |
623 | | -addCommandAlias("runSourceAnalyzer", "; clean; compile; analyzeSource") |
0 commit comments