From b4d0d8ba017d47bb72757e0ba8c63cfed190f1ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20Leuth=C3=A4user?= <1417198+max-leuthaeuser@users.noreply.github.com> Date: Wed, 3 Apr 2024 09:00:23 +0200 Subject: [PATCH] Updated dependencies (#4418) Not going to Scala 3.4 (brings in some Syntax changes / many rewrites required with -rewrite source3.4migration) --- .scalafmt.conf | 2 +- build.sbt | 4 ++-- console/build.sbt | 8 ++++---- joern-cli/frontends/c2cpg/build.sbt | 4 ++-- joern-cli/frontends/csharpsrc2cpg/build.sbt | 2 +- joern-cli/frontends/ghidra2cpg/build.sbt | 2 +- joern-cli/frontends/gosrc2cpg/build.sbt | 4 ++-- joern-cli/frontends/javasrc2cpg/build.sbt | 6 +++--- joern-cli/frontends/jssrc2cpg/build.sbt | 2 +- joern-cli/frontends/kotlin2cpg/build.sbt | 2 +- project/Versions.scala | 12 ++++++------ project/plugins.sbt | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index ab5a05488f23..2efa7c1ea831 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.17 +version = 3.8.1 runner.dialect = scala3 preset = IntelliJ maxColumn = 120 diff --git a/build.sbt b/build.sbt index 8cacee33d2b8..dc3ed4ab123e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ name := "joern" ThisBuild / organization := "io.joern" -ThisBuild / scalaVersion := "3.3.1" +ThisBuild / scalaVersion := "3.3.3" -val cpgVersion = "1.6.9" +val cpgVersion = "1.6.10" lazy val joerncli = Projects.joerncli lazy val querydb = Projects.querydb diff --git a/console/build.sbt b/console/build.sbt index a6534ce94f81..41111212aeaf 100644 --- a/console/build.sbt +++ b/console/build.sbt @@ -3,11 +3,11 @@ name := "console" enablePlugins(JavaAppPackaging) val ScoptVersion = "4.1.0" -val CaskVersion = "0.9.1" +val CaskVersion = "0.9.2" val CirceVersion = "0.14.6" -val ZeroturnaroundVersion = "1.15" -val OsLibVersion = "0.9.1" -val PprintVersion = "0.7.3" +val ZeroturnaroundVersion = "1.17" +val OsLibVersion = "0.9.3" +val PprintVersion = "0.8.1" val CommonsLangVersion = "3.14.0" dependsOn( diff --git a/joern-cli/frontends/c2cpg/build.sbt b/joern-cli/frontends/c2cpg/build.sbt index f4bb2612871f..bedf789e36da 100644 --- a/joern-cli/frontends/c2cpg/build.sbt +++ b/joern-cli/frontends/c2cpg/build.sbt @@ -8,8 +8,8 @@ dependsOn( libraryDependencies ++= Seq( "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4", - "org.eclipse.platform" % "org.eclipse.core.resources" % "3.20.0", - "org.eclipse.platform" % "org.eclipse.text" % "3.13.100", + "org.eclipse.platform" % "org.eclipse.core.resources" % "3.20.100", + "org.eclipse.platform" % "org.eclipse.text" % "3.14.0", // see note in readme re self-publishing cdt-core "io.joern" % "eclipse-cdt-core" % "8.4.0.202401242025", "org.scalatest" %% "scalatest" % Versions.scalatest % Test diff --git a/joern-cli/frontends/csharpsrc2cpg/build.sbt b/joern-cli/frontends/csharpsrc2cpg/build.sbt index 86254afb1ee1..29e967406e88 100644 --- a/joern-cli/frontends/csharpsrc2cpg/build.sbt +++ b/joern-cli/frontends/csharpsrc2cpg/build.sbt @@ -21,7 +21,7 @@ astGenVersion := appProperties.value.getString("csharpsrc2cpg.dotnetastgen_versi libraryDependencies ++= Seq( "io.shiftleft" %% "codepropertygraph" % Versions.cpg, - "com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.17.0", "org.scalatest" %% "scalatest" % Versions.scalatest % Test ) diff --git a/joern-cli/frontends/ghidra2cpg/build.sbt b/joern-cli/frontends/ghidra2cpg/build.sbt index 57ad96c7a3fa..9fe9d9041976 100644 --- a/joern-cli/frontends/ghidra2cpg/build.sbt +++ b/joern-cli/frontends/ghidra2cpg/build.sbt @@ -5,7 +5,7 @@ dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->t libraryDependencies ++= Seq( "io.joern" % "ghidra" % "11.0_PUBLIC_20231222-2", "com.github.scopt" %% "scopt" % "4.1.0", - "commons-io" % "commons-io" % "2.13.0", + "commons-io" % "commons-io" % "2.16.0", "io.shiftleft" %% "codepropertygraph" % Versions.cpg, "io.shiftleft" %% "codepropertygraph-protos" % Versions.cpg, "org.scalatest" %% "scalatest" % Versions.scalatest % Test diff --git a/joern-cli/frontends/gosrc2cpg/build.sbt b/joern-cli/frontends/gosrc2cpg/build.sbt index 051259e28d49..5feaff4377b0 100644 --- a/joern-cli/frontends/gosrc2cpg/build.sbt +++ b/joern-cli/frontends/gosrc2cpg/build.sbt @@ -10,8 +10,8 @@ dependsOn(Projects.dataflowengineoss % "compile->compile;test->test", Projects.x libraryDependencies ++= Seq( "io.shiftleft" %% "codepropertygraph" % Versions.cpg, "org.scalatest" %% "scalatest" % Versions.scalatest % Test, - "com.lihaoyi" %% "os-lib" % "0.9.1", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2", + "com.lihaoyi" %% "os-lib" % "0.9.3", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.17.0", "io.circe" %% "circe-core" % Versions.circe, "io.circe" %% "circe-generic" % Versions.circe, "io.circe" %% "circe-parser" % Versions.circe diff --git a/joern-cli/frontends/javasrc2cpg/build.sbt b/joern-cli/frontends/javasrc2cpg/build.sbt index 689cae2db468..291fb186fd44 100644 --- a/joern-cli/frontends/javasrc2cpg/build.sbt +++ b/joern-cli/frontends/javasrc2cpg/build.sbt @@ -4,12 +4,12 @@ dependsOn(Projects.dataflowengineoss % "compile->compile;test->test", Projects.x libraryDependencies ++= Seq( "io.shiftleft" %% "codepropertygraph" % Versions.cpg, - "com.github.javaparser" % "javaparser-symbol-solver-core" % "3.25.8", + "com.github.javaparser" % "javaparser-symbol-solver-core" % "3.25.9", "org.gradle" % "gradle-tooling-api" % Versions.gradleTooling, "org.scalatest" %% "scalatest" % Versions.scalatest % Test, - "org.projectlombok" % "lombok" % "1.18.30", + "org.projectlombok" % "lombok" % "1.18.32", "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4", - "org.scala-lang.modules" %% "scala-parser-combinators" % "2.2.0", + "org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0", "net.lingala.zip4j" % "zip4j" % "2.11.5" ) diff --git a/joern-cli/frontends/jssrc2cpg/build.sbt b/joern-cli/frontends/jssrc2cpg/build.sbt index 30d8c398f6b8..51a72f9ff1bf 100644 --- a/joern-cli/frontends/jssrc2cpg/build.sbt +++ b/joern-cli/frontends/jssrc2cpg/build.sbt @@ -19,7 +19,7 @@ astGenVersion := appProperties.value.getString("jssrc2cpg.astgen_version") libraryDependencies ++= Seq( "io.shiftleft" %% "codepropertygraph" % Versions.cpg, - "com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.17.0", "org.scalatest" %% "scalatest" % Versions.scalatest % Test ) diff --git a/joern-cli/frontends/kotlin2cpg/build.sbt b/joern-cli/frontends/kotlin2cpg/build.sbt index 4c73205f078f..e8c88a15a785 100644 --- a/joern-cli/frontends/kotlin2cpg/build.sbt +++ b/joern-cli/frontends/kotlin2cpg/build.sbt @@ -1,6 +1,6 @@ name := "kotlin2cpg" -val kotlinVersion = "1.9.10" +val kotlinVersion = "1.9.23" dependsOn( Projects.dataflowengineoss % "compile->compile;test->test", diff --git a/project/Versions.scala b/project/Versions.scala index 62d8123beb2f..d28a56de1375 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -3,16 +3,16 @@ object Versions { val cpg = parseVersion("cpgVersion") // Dont upgrade antlr to 4.10 or above since those versions require java 11 or higher which // causes problems upstreams. - val antlr = "4.7" - val scalatest = "3.2.16" - val cats = "3.5.0" + val antlr = "4.7.2" + val scalatest = "3.2.18" + val cats = "3.5.4" val json4s = "4.0.7" val gradleTooling = "8.3" - val circe = "0.14.5" + val circe = "0.14.6" val requests = "0.8.0" - val upickle = "3.1.3" + val upickle = "3.2.0" val scalaReplPP = "0.1.83" - val typeSafeConfig = "1.4.2" + val typeSafeConfig = "1.4.3" val versionSort = "1.0.11" private def parseVersion(key: String): String = { diff --git a/project/plugins.sbt b/project/plugins.sbt index 94a0cf494cd0..9f8db4127d54 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.3") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.0.19") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")