Skip to content

Commit 692d3bc

Browse files
committed
build: Drop fortify
1 parent 4af0506 commit 692d3bc

File tree

4 files changed

+1
-99
lines changed

4 files changed

+1
-99
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ native/
102102

103103
.tmp
104104

105-
/fortify-scans/
106-
107105
# attachments created by scripts/prepare-downloads.sh
108106
akka-docs/src/main/paradox/attachments
109107

build.sbt

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import akka.Dependencies.{ allScalaVersions, fortifySCAVersion, scalaFortifyVersion }
1+
import akka.Dependencies.allScalaVersions
22
import akka.{ AutomaticModuleName, CopyrightHeaderForBuild, Paradox }
33
import com.geirsson.CiReleasePlugin
44

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

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-
566549
def akkaModule(name: String): Project =
567550
Project(id = name, base = file(name))
568551
.enablePlugins(ReproducibleBuildsPlugin)
569552
.settings(akka.AkkaBuild.buildSettings)
570553
.settings(akka.AkkaBuild.defaultSettings)
571-
.settings(fortifySettings(name))
572554
.enablePlugins(BootstrapGenjavadoc)
573555
.disablePlugins(CiReleasePlugin) // we use publishSigned, but use a pgp utility from CiReleasePlugin
574556

@@ -605,19 +587,3 @@ addCommandAlias(
605587
commandValue(clusterShardingTyped),
606588
commandValue(persistenceTyped),
607589
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")

project/Dependencies.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ object Dependencies {
2424
val nettyVersion = "4.2.0.Final"
2525
val protobufJavaVersion = "3.25.5" // also sync with protocVersion in Protobuf.scala
2626
val logbackVersion = "1.5.18"
27-
val scalaFortifyVersion = "1.0.22"
28-
val fortifySCAVersion = "22.1"
2927
val jacksonCoreVersion = "2.18.4" // https://github.com/FasterXML/jackson/wiki/Jackson-Releases
3028
val jacksonDatabindVersion = jacksonCoreVersion // https://github.com/FasterXML/jackson/wiki/Jackson-Releases
3129

scripts/runSourceAnalyzer.sh

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)