From 32acff28c506889fedc261a9197a08be3c5598ca Mon Sep 17 00:00:00 2001 From: Markus Lottmann Date: Fri, 21 Oct 2022 18:23:38 +0200 Subject: [PATCH] Frontends only need to depend on dataflowengineoss for tests. Also fixed up dependencies for querydb since it so far only got dataflowengineoss transitively which is now not the case anymore. --- joern-cli/frontends/ghidra2cpg/build.sbt | 2 +- joern-cli/frontends/javasrc2cpg/build.sbt | 2 +- joern-cli/frontends/jimple2cpg/build.sbt | 2 +- joern-cli/frontends/jssrc2cpg/build.sbt | 2 +- .../src/main/scala/io/joern/jssrc2cpg/JsSrc2Cpg.scala | 11 ----------- joern-cli/frontends/kotlin2cpg/build.sbt | 2 +- joern-cli/frontends/pysrc2cpg/build.sbt | 2 +- querydb/build.sbt | 1 + 8 files changed, 7 insertions(+), 17 deletions(-) diff --git a/joern-cli/frontends/ghidra2cpg/build.sbt b/joern-cli/frontends/ghidra2cpg/build.sbt index 70981444b434..ce29d4c47124 100644 --- a/joern-cli/frontends/ghidra2cpg/build.sbt +++ b/joern-cli/frontends/ghidra2cpg/build.sbt @@ -1,6 +1,6 @@ name := "ghidra2cpg" -dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test") +dependsOn(Projects.dataflowengineoss % Test, Projects.x2cpg % "compile->compile;test->test") libraryDependencies ++= Seq( "com.github.scopt" %% "scopt" % "4.1.0", diff --git a/joern-cli/frontends/javasrc2cpg/build.sbt b/joern-cli/frontends/javasrc2cpg/build.sbt index 25ad2ec9977c..8ad7bf092ac6 100644 --- a/joern-cli/frontends/javasrc2cpg/build.sbt +++ b/joern-cli/frontends/javasrc2cpg/build.sbt @@ -3,7 +3,7 @@ name := "javasrc2cpg" scalaVersion := "2.13.8" crossScalaVersions := Seq("2.13.8", "3.1.3") -dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test") +dependsOn(Projects.dataflowengineoss % Test, Projects.x2cpg % "compile->compile;test->test") libraryDependencies ++= Seq( "io.shiftleft" %% "codepropertygraph" % Versions.cpg, diff --git a/joern-cli/frontends/jimple2cpg/build.sbt b/joern-cli/frontends/jimple2cpg/build.sbt index 52098493f22c..6e5dd43b2b76 100644 --- a/joern-cli/frontends/jimple2cpg/build.sbt +++ b/joern-cli/frontends/jimple2cpg/build.sbt @@ -3,7 +3,7 @@ name := "jimple2cpg" scalaVersion := "2.13.8" crossScalaVersions := Seq("2.13.8", "3.1.3") -dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test") +dependsOn(Projects.dataflowengineoss % Test, Projects.x2cpg % "compile->compile;test->test") libraryDependencies ++= Seq( "io.shiftleft" %% "codepropertygraph" % Versions.cpg, diff --git a/joern-cli/frontends/jssrc2cpg/build.sbt b/joern-cli/frontends/jssrc2cpg/build.sbt index 410cfbb11dfe..38dd44fa1433 100644 --- a/joern-cli/frontends/jssrc2cpg/build.sbt +++ b/joern-cli/frontends/jssrc2cpg/build.sbt @@ -2,7 +2,7 @@ name := "jssrc2cpg" scalaVersion := "2.13.8" crossScalaVersions := Seq("2.13.8", "3.1.3") -dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test") +dependsOn(Projects.dataflowengineoss % Test, Projects.x2cpg % "compile->compile;test->test") val astGenVersion = "2.2.0" diff --git a/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/JsSrc2Cpg.scala b/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/JsSrc2Cpg.scala index a320b0e0be57..4dd740ec0b57 100644 --- a/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/JsSrc2Cpg.scala +++ b/joern-cli/frontends/jssrc2cpg/src/main/scala/io/joern/jssrc2cpg/JsSrc2Cpg.scala @@ -1,8 +1,6 @@ package io.joern.jssrc2cpg import better.files.File -import io.joern.dataflowengineoss.layers.dataflows.{OssDataFlow, OssDataFlowOptions} -import io.joern.jssrc2cpg.JsSrc2Cpg.postProcessingPasses import io.joern.jssrc2cpg.passes.{ AstCreationPass, BuiltinTypesPass, @@ -61,15 +59,6 @@ class JsSrc2Cpg extends X2CpgFrontend[Config] { } } - def createCpgWithAllOverlays(config: Config): Try[Cpg] = { - val maybeCpg = createCpgWithOverlays(config) - maybeCpg.map { cpg => - new OssDataFlow(new OssDataFlowOptions()).run(new LayerCreatorContext(cpg)) - postProcessingPasses(cpg).foreach(_.createAndApply()) - cpg - } - } - } object JsSrc2Cpg { diff --git a/joern-cli/frontends/kotlin2cpg/build.sbt b/joern-cli/frontends/kotlin2cpg/build.sbt index a72431eaed86..5e02fec37cd2 100644 --- a/joern-cli/frontends/kotlin2cpg/build.sbt +++ b/joern-cli/frontends/kotlin2cpg/build.sbt @@ -2,7 +2,7 @@ name := "kotlin2cpg" val kotlinVersion = "1.6.21" -dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test") +dependsOn(Projects.dataflowengineoss % Test, Projects.x2cpg % "compile->compile;test->test") libraryDependencies ++= Seq( "com.github.pathikrit" %% "better-files" % "3.9.1", diff --git a/joern-cli/frontends/pysrc2cpg/build.sbt b/joern-cli/frontends/pysrc2cpg/build.sbt index 2fbb6ac78b71..6864931bd641 100644 --- a/joern-cli/frontends/pysrc2cpg/build.sbt +++ b/joern-cli/frontends/pysrc2cpg/build.sbt @@ -2,7 +2,7 @@ name := "pysrc2cpg" scalaVersion := "2.13.8" -dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test") +dependsOn(Projects.dataflowengineoss % Test, Projects.x2cpg % "compile->compile;test->test") libraryDependencies ++= Seq( "io.shiftleft" %% "codepropertygraph" % Versions.cpg, diff --git a/querydb/build.sbt b/querydb/build.sbt index 089b79e9dfe3..ba0d0330a4bc 100644 --- a/querydb/build.sbt +++ b/querydb/build.sbt @@ -5,6 +5,7 @@ enablePlugins(JavaAppPackaging) dependsOn( Projects.console, Projects.macros, + Projects.dataflowengineoss, Projects.ghidra2cpg, Projects.ghidra2cpg % "test->test", Projects.c2cpg % "test->test",