upgrade deps and adapt (#342)

* upgrade deps and adapt

* fix updateDependencies.sh

* fmt

Author: mpollmeier

build.sbt

@@ -1,5 +1,5 @@
-val cpgVersion   = "1.4.25"
-val joernVersion = "2.0.140"
+val cpgVersion   = "1.6.11"
+val joernVersion = "2.0.335"
 
 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
   )
 )
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.9

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)

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()))

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

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 =

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)
   }
 

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._

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

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 {