diff --git a/build.sbt b/build.sbt index 14fb59ea3..12febb326 100644 --- a/build.sbt +++ b/build.sbt @@ -7,9 +7,9 @@ ThisBuild / scalaVersion := "3.3.1" ThisBuild / version := sys.env.getOrElse("BUILD_VERSION", "dev-SNAPSHOT") // parsed by project/Versions.scala, updated by updateDependencies.sh -val cpgVersion = "1.6.6" -val joernVersion = "2.0.290" -val overflowdbVersion = "1.187" +val cpgVersion = "1.6.10" +val joernVersion = "2.0.311" +val overflowdbVersion = "1.190" val requests = "0.8.0" val upickle = "3.1.2" diff --git a/src/main/scala/ai/privado/cache/AppCache.scala b/src/main/scala/ai/privado/cache/AppCache.scala index ad336f574..a217d7066 100644 --- a/src/main/scala/ai/privado/cache/AppCache.scala +++ b/src/main/scala/ai/privado/cache/AppCache.scala @@ -46,6 +46,6 @@ class AppCache( def init(path: String): Unit = { this.scanPath = path.stripSuffix("/") // Scan Path of the repo on the host machine this.localScanPath = getRepoScanPath(path) // scan path perceived by the binary (can be different inside docker) - this.repoName = this.localScanPath.split("/\\\\").last + this.repoName = this.localScanPath.split("[/\\\\]").lastOption.getOrElse("") } } diff --git a/src/test/scala/ai/privado/languageEngine/java/audit/DataElementDiscoveryTestBase.scala b/src/test/scala/ai/privado/languageEngine/java/audit/DataElementDiscoveryTestBase.scala index fb9768478..828bc0414 100644 --- a/src/test/scala/ai/privado/languageEngine/java/audit/DataElementDiscoveryTestBase.scala +++ b/src/test/scala/ai/privado/languageEngine/java/audit/DataElementDiscoveryTestBase.scala @@ -25,7 +25,9 @@ abstract class DataElementDiscoveryTestBase extends AnyWordSpec with Matchers wi outputDir = File.newTemporaryDirectory() val config = - Config(fetchDependencies = true).withInputPath(inputDir.pathAsString).withOutputPath(outputDir.pathAsString) + Config(fetchDependencies = true, delombokMode = Some("no-delombok")) + .withInputPath(inputDir.pathAsString) + .withOutputPath(outputDir.pathAsString) val javaSrc = new JavaSrc2Cpg() val xtocpg = javaSrc.createCpg(config).map { cpg => applyDefaultOverlays(cpg)