Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ native/

.tmp

/fortify-scans/

# attachments created by scripts/prepare-downloads.sh
akka-docs/src/main/paradox/attachments

Expand Down
36 changes: 1 addition & 35 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import akka.Dependencies.{ allScalaVersions, fortifySCAVersion, scalaFortifyVersion }
import akka.Dependencies.allScalaVersions
import akka.{ AutomaticModuleName, CopyrightHeaderForBuild, Paradox }
import com.geirsson.CiReleasePlugin

Expand Down Expand Up @@ -546,29 +546,11 @@ lazy val billOfMaterials = Project("akka-bill-of-materials", file("akka-bill-of-
bomIncludeProjects := userProjects,
description := s"${description.value} (depending on Scala ${CrossVersion.binaryScalaVersion(scalaVersion.value)})")

lazy val doesFortifyLicenseExist: Boolean = {
import java.nio.file.Files
val home = System.getProperty("user.home")
val fortifyLicense = new File(s"$home/.lightbend/fortify.license")
Files.exists(fortifyLicense.toPath)
}

def fortifySettings(name: String) = {
if (doesFortifyLicenseExist) {
Seq(
addCompilerPlugin(("com.lightbend" %% "scala-fortify" % scalaFortifyVersion).cross(CrossVersion.patch)),
scalacOptions ++= Seq(s"-P:fortify:scaversion=$fortifySCAVersion", s"-P:fortify:build=$name"))
} else {
Seq()
}
}

def akkaModule(name: String): Project =
Project(id = name, base = file(name))
.enablePlugins(ReproducibleBuildsPlugin)
.settings(akka.AkkaBuild.buildSettings)
.settings(akka.AkkaBuild.defaultSettings)
.settings(fortifySettings(name))
.enablePlugins(BootstrapGenjavadoc)
.disablePlugins(CiReleasePlugin) // we use publishSigned, but use a pgp utility from CiReleasePlugin

Expand Down Expand Up @@ -605,19 +587,3 @@ addCommandAlias(
commandValue(clusterShardingTyped),
commandValue(persistenceTyped),
commandValue(streamTyped)).mkString)

// Convenience task allowing all Fortify steps to be done in the sbt shell
lazy val analyzeSource = taskKey[Unit]("Analyzing NST files emitted by Fortify SCA")
analyzeSource := {
val s = streams.value
val shell = Seq("bash", "-c")
val scan = shell :+ s"./scripts/runSourceAnalyzer.sh $fortifySCAVersion"
if (doesFortifyLicenseExist) {
s.log.info("Analyzing NST files emitted by Fortify SCA.")
scan !
} else {
s.log.info("Fortify license not found so NST files creation was skipped.")
}
}

addCommandAlias("runSourceAnalyzer", "; clean; compile; analyzeSource")
2 changes: 0 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ object Dependencies {
val nettyVersion = "4.2.0.Final"
val protobufJavaVersion = "3.25.5" // also sync with protocVersion in Protobuf.scala
val logbackVersion = "1.5.18"
val scalaFortifyVersion = "1.0.22"
val fortifySCAVersion = "22.1"
val jacksonCoreVersion = "2.18.4" // https://github.com/FasterXML/jackson/wiki/Jackson-Releases
val jacksonDatabindVersion = jacksonCoreVersion // https://github.com/FasterXML/jackson/wiki/Jackson-Releases

Expand Down
60 changes: 0 additions & 60 deletions scripts/runSourceAnalyzer.sh

This file was deleted.