From ffc20ebe47e580147f3ac60537b44daab7e5ba20 Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Thu, 18 Apr 2024 15:32:34 +0200 Subject: [PATCH 1/3] upgrade deps and adapt --- build.sbt | 8 ++++---- project/build.properties | 2 +- .../io/shiftleft/js2cpg/astcreation/AstCreator.scala | 2 +- .../scala/io/shiftleft/js2cpg/io/ExternalCommand.scala | 4 ++-- src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala | 4 ++-- .../io/shiftleft/js2cpg/parser/DefaultAstVisitor.scala | 4 ++-- .../shiftleft/js2cpg/parser/GeneralizingAstVisitor.scala | 4 ++-- src/main/scala/io/shiftleft/js2cpg/parser/JsSource.scala | 2 +- .../io/shiftleft/js2cpg/parser/PackageJsonParser.scala | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.sbt b/build.sbt index e7ae20d51..188fbacff 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ -val cpgVersion = "1.4.25" -val joernVersion = "2.0.140" +val cpgVersion = "1.6.11" +val joernVersion = "1.2.44" val gitCommitString = SettingKey[String]("gitSha") @@ -16,7 +16,7 @@ Global / excludeLintKeys += Fast / configuration Global / excludeLintKeys += gitCommitString lazy val commonSettings = Seq( - scalaVersion := "3.3.1", + scalaVersion := "3.4.1", organization := "io.shiftleft", scalacOptions ++= Seq("-Xtarget:8"), resolvers ++= Seq( @@ -35,7 +35,7 @@ lazy val commonSettings = Seq( "org.apache.logging.log4j" % "log4j-slf4j2-impl" % "2.20.0" % Optional, "org.apache.logging.log4j" % "log4j-core" % "2.20.0" % Optional, "io.joern" %% "x2cpg" % joernVersion % Test classifier "tests", - "org.scalatest" %% "scalatest" % "3.2.17" % Test + "org.scalatest" %% "scalatest" % "3.2.18" % Test ) ) diff --git a/project/build.properties b/project/build.properties index 304098715..04267b14a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.4 +sbt.version=1.9.9 diff --git a/src/main/scala/io/shiftleft/js2cpg/astcreation/AstCreator.scala b/src/main/scala/io/shiftleft/js2cpg/astcreation/AstCreator.scala index cd506eea0..b1e34ddb3 100644 --- a/src/main/scala/io/shiftleft/js2cpg/astcreation/AstCreator.scala +++ b/src/main/scala/io/shiftleft/js2cpg/astcreation/AstCreator.scala @@ -1123,7 +1123,7 @@ class AstCreator(diffGraph: DiffGraphBuilder, source: JsSource, usedIdentNodes: } } - override def visit(literalNode: LiteralNode[_]): NewNode = { + override def visit(literalNode: LiteralNode[?]): NewNode = { literalNode match { case arrayLiteralNode: ArrayLiteralNode => createArrayLiteralNode(arrayLiteralNode) diff --git a/src/main/scala/io/shiftleft/js2cpg/io/ExternalCommand.scala b/src/main/scala/io/shiftleft/js2cpg/io/ExternalCommand.scala index f672e0615..ad000aaaf 100644 --- a/src/main/scala/io/shiftleft/js2cpg/io/ExternalCommand.scala +++ b/src/main/scala/io/shiftleft/js2cpg/io/ExternalCommand.scala @@ -4,7 +4,7 @@ import java.util.concurrent.ConcurrentLinkedQueue import scala.sys.process.{Process, ProcessLogger} import scala.util.{Failure, Success, Try} import scala.jdk.CollectionConverters._ -import org.apache.commons.lang.StringUtils +import org.apache.commons.lang3.StringUtils object ExternalCommand { @@ -21,7 +21,7 @@ object ExternalCommand { val commands = command.split(COMMAND_AND).toSeq commands.map { cmd => val cmdWithQuotesAroundDir = StringUtils.replace(cmd, inDir, s"'$inDir'") - Try(Process(cmdWithQuotesAroundDir, dir, extraEnv.toList: _*).!(processLogger)).getOrElse(1) + Try(Process(cmdWithQuotesAroundDir, dir, extraEnv.toList*).!(processLogger)).getOrElse(1) }.sum match { case 0 => Success(stdOutOutput.asScala.mkString(System.lineSeparator())) diff --git a/src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala b/src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala index 54c1b0381..384a313a0 100644 --- a/src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala +++ b/src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala @@ -103,7 +103,7 @@ object FileUtils { override def visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult = { val result = fileCollector.visitFile(file, attrs) if (!fileCollector.wasExcluded(file)) { - Files.copy(file, newPath(file), copyOptions: _*) + Files.copy(file, newPath(file), copyOptions*) } result } @@ -120,7 +120,7 @@ object FileUtils { } ) } else { - Files.copy(from.path, destination.path, copyOptions: _*) + Files.copy(from.path, destination.path, copyOptions*) } excludedPaths.addAll(fileCollector.excludedPaths) destination diff --git a/src/main/scala/io/shiftleft/js2cpg/parser/DefaultAstVisitor.scala b/src/main/scala/io/shiftleft/js2cpg/parser/DefaultAstVisitor.scala index 8cf866dbb..ce2da7e63 100644 --- a/src/main/scala/io/shiftleft/js2cpg/parser/DefaultAstVisitor.scala +++ b/src/main/scala/io/shiftleft/js2cpg/parser/DefaultAstVisitor.scala @@ -168,10 +168,10 @@ abstract class DefaultAstVisitor(lexicalContext: LexicalContext = new LexicalCon override def leaveLabelNode(labelNode: LabelNode): Node = super.leaveLabelNode(labelNode) - override def enterLiteralNode(literalNode: LiteralNode[_]): Boolean = + override def enterLiteralNode(literalNode: LiteralNode[?]): Boolean = super.enterLiteralNode(literalNode) - override def leaveLiteralNode(literalNode: LiteralNode[_]): Node = + override def leaveLiteralNode(literalNode: LiteralNode[?]): Node = super.leaveLiteralNode(literalNode) override def enterNameSpaceImportNode(nameSpaceImportNode: NameSpaceImportNode): Boolean = diff --git a/src/main/scala/io/shiftleft/js2cpg/parser/GeneralizingAstVisitor.scala b/src/main/scala/io/shiftleft/js2cpg/parser/GeneralizingAstVisitor.scala index 090ce5b40..454258454 100644 --- a/src/main/scala/io/shiftleft/js2cpg/parser/GeneralizingAstVisitor.scala +++ b/src/main/scala/io/shiftleft/js2cpg/parser/GeneralizingAstVisitor.scala @@ -200,7 +200,7 @@ class GeneralizingAstVisitor[T] extends TranslatorNodeVisitor[LexicalContext, T] visit(node.asInstanceOf[Statement]) } - def visit(node: LiteralNode[_]): T = { + def visit(node: LiteralNode[?]): T = { visit(node.asInstanceOf[Expression]) } @@ -388,7 +388,7 @@ class GeneralizingAstVisitor[T] extends TranslatorNodeVisitor[LexicalContext, T] visit(node) } - override def enterLiteralNode(node: LiteralNode[_]): T = { + override def enterLiteralNode(node: LiteralNode[?]): T = { visit(node) } diff --git a/src/main/scala/io/shiftleft/js2cpg/parser/JsSource.scala b/src/main/scala/io/shiftleft/js2cpg/parser/JsSource.scala index b28e9d292..7c6afada9 100644 --- a/src/main/scala/io/shiftleft/js2cpg/parser/JsSource.scala +++ b/src/main/scala/io/shiftleft/js2cpg/parser/JsSource.scala @@ -9,7 +9,7 @@ import io.shiftleft.js2cpg.io.FileDefaults._ import io.shiftleft.js2cpg.io.FileUtils import io.shiftleft.js2cpg.preprocessing.NuxtTranspiler import io.shiftleft.utils.IOUtils -import org.apache.commons.lang.StringUtils +import org.apache.commons.lang3.StringUtils import org.slf4j.LoggerFactory import scala.jdk.CollectionConverters._ diff --git a/src/main/scala/io/shiftleft/js2cpg/parser/PackageJsonParser.scala b/src/main/scala/io/shiftleft/js2cpg/parser/PackageJsonParser.scala index 5a7b54cf6..040e65d3a 100644 --- a/src/main/scala/io/shiftleft/js2cpg/parser/PackageJsonParser.scala +++ b/src/main/scala/io/shiftleft/js2cpg/parser/PackageJsonParser.scala @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory import com.fasterxml.jackson.databind.ObjectMapper import io.shiftleft.js2cpg.io.FileDefaults import io.shiftleft.utils.IOUtils -import org.apache.commons.lang.StringUtils +import org.apache.commons.lang3.StringUtils import scala.collection.concurrent.TrieMap import scala.util.Try From 98f892f899973a7ab426d67fbee9d766c00015bf Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Fri, 19 Apr 2024 09:20:11 +0200 Subject: [PATCH 2/3] fix updateDependencies.sh --- build.sbt | 2 +- updateDependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 188fbacff..2983f561a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ val cpgVersion = "1.6.11" -val joernVersion = "1.2.44" +val joernVersion = "2.0.335" val gitCommitString = SettingKey[String]("gitSha") diff --git a/updateDependencies.sh b/updateDependencies.sh index 518938e5c..826e04084 100755 --- a/updateDependencies.sh +++ b/updateDependencies.sh @@ -21,7 +21,7 @@ fi declare -A repos=( [cpg]=https://repo1.maven.org/maven2/io/shiftleft/codepropertygraph-schema_3 - [joern]=https://repo1.maven.org/maven2/io/joern/console_2.13 + [joern]=https://repo1.maven.org/maven2/io/joern/console_3 ) function latest_version { From 7d1a9ec73cc528fc9c1bfce841b7e6e3d6e84ea4 Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Fri, 19 Apr 2024 11:15:40 +0200 Subject: [PATCH 3/3] fmt --- src/main/scala/io/shiftleft/js2cpg/io/ExternalCommand.scala | 2 +- src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/io/shiftleft/js2cpg/io/ExternalCommand.scala b/src/main/scala/io/shiftleft/js2cpg/io/ExternalCommand.scala index ad000aaaf..726f7656f 100644 --- a/src/main/scala/io/shiftleft/js2cpg/io/ExternalCommand.scala +++ b/src/main/scala/io/shiftleft/js2cpg/io/ExternalCommand.scala @@ -21,7 +21,7 @@ object ExternalCommand { val commands = command.split(COMMAND_AND).toSeq commands.map { cmd => val cmdWithQuotesAroundDir = StringUtils.replace(cmd, inDir, s"'$inDir'") - Try(Process(cmdWithQuotesAroundDir, dir, extraEnv.toList*).!(processLogger)).getOrElse(1) + Try(Process(cmdWithQuotesAroundDir, dir, extraEnv.toList *).!(processLogger)).getOrElse(1) }.sum match { case 0 => Success(stdOutOutput.asScala.mkString(System.lineSeparator())) diff --git a/src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala b/src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala index 384a313a0..bc747d8c4 100644 --- a/src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala +++ b/src/main/scala/io/shiftleft/js2cpg/io/FileUtils.scala @@ -103,7 +103,7 @@ object FileUtils { override def visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult = { val result = fileCollector.visitFile(file, attrs) if (!fileCollector.wasExcluded(file)) { - Files.copy(file, newPath(file), copyOptions*) + Files.copy(file, newPath(file), copyOptions *) } result } @@ -120,7 +120,7 @@ object FileUtils { } ) } else { - Files.copy(from.path, destination.path, copyOptions*) + Files.copy(from.path, destination.path, copyOptions *) } excludedPaths.addAll(fileCollector.excludedPaths) destination