diff --git a/CHANGELOG.md b/CHANGELOG.md index ac749901..4691bbf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.2.4] - 2022-04-13 + +### Changed + +- Upgraded `Joern` with latest bug fixes in JVM bytecode frontend. + ## [1.2.3] - 2022-04-05 ### Changed diff --git a/build.sbt b/build.sbt index f720e4ab..8b4d617e 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ name := "Plume" inThisBuild( List( organization := "com.github.plume-oss", - version := "1.2.3", + version := "1.2.4", scalaVersion := "2.13.8", crossScalaVersions := Seq("2.13.8", "3.1.1"), resolvers ++= Seq( @@ -15,8 +15,7 @@ inThisBuild( ) ) -val cpgVersion = "1.3.527" -val joernVersion = "1.1.692" +val joernVersion = "1.1.726" val sootVersion = "4.3.0" val tinkerGraphVersion = "3.4.11" val neo4jVersion = "4.4.5" @@ -43,7 +42,6 @@ Test / fork := true Test / parallelExecution := false libraryDependencies ++= Seq( - "io.shiftleft" %% "codepropertygraph" % cpgVersion, "io.joern" %% "semanticcpg" % joernVersion, "io.joern" %% "dataflowengineoss" % joernVersion, "io.joern" %% "x2cpg" % joernVersion, diff --git a/src/test/scala/com/github/plume/oss/querying/ConstructorInvocationTests.scala b/src/test/scala/com/github/plume/oss/querying/ConstructorInvocationTests.scala index f8c625f8..54634a21 100644 --- a/src/test/scala/com/github/plume/oss/querying/ConstructorInvocationTests.scala +++ b/src/test/scala/com/github/plume/oss/querying/ConstructorInvocationTests.scala @@ -59,11 +59,10 @@ class ConstructorInvocationTests extends Jimple2CpgFixture { cons.signature shouldBe "void(int)" cons.code shouldBe "Foo(int x)" cons.parameter.size shouldBe 2 - val objParam = cons.parameter.index(0).head + val List(objParam, otherParam) = cons.parameter.l objParam.name shouldBe "this" objParam.typeFullName shouldBe "Foo" objParam.dynamicTypeHintFullName shouldBe Seq("Foo") - val otherParam = cons.parameter.index(1).head otherParam.name shouldBe "x" otherParam.typeFullName shouldBe "int" otherParam.dynamicTypeHintFullName shouldBe Seq() @@ -78,16 +77,18 @@ class ConstructorInvocationTests extends Jimple2CpgFixture { cons1.signature shouldBe "void(int)" cons1.code shouldBe "Bar(int x)" cons1.parameter.size shouldBe 2 - cons1.parameter.index(0).head.name shouldBe "this" - cons1.parameter.index(1).head.name shouldBe "x" + val List(objParam1, otherParam) = cons1.parameter.l + objParam1.name shouldBe "this" + otherParam.name shouldBe "x" cons2.fullName shouldBe "Bar.:void(int,int)" cons2.signature shouldBe "void(int,int)" cons2.code shouldBe "Bar(int x, int y)" cons2.parameter.size shouldBe 3 - cons2.parameter.index(0).head.name shouldBe "this" - cons2.parameter.index(1).head.name shouldBe "x" - cons2.parameter.index(2).head.name shouldBe "y" + val List(objParam2, xParam, yParam) = cons2.parameter.l + objParam2.name shouldBe "this" + xParam.name shouldBe "x" + yParam.name shouldBe "y" case res => fail(s"Expected 2 Bar constructors, but got $res")