Skip to content

Commit

Permalink
Merge pull request #21 from ShiftLeftSecurity/michael/upgrade5
Browse files Browse the repository at this point in the history
upgrade cpg
  • Loading branch information
mpollmeier authored Oct 6, 2021
2 parents 0f0ff03 + 61307d4 commit 3f57322
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val cpgVersion = "1.3.327"
val cpgVersion = "1.3.354"

val gitCommitString = SettingKey[String]("gitSha")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class DependenciesPass(cpg: Cpg, config: Config, keyPool: KeyPool)
val dep = NewDependency()
.name(name)
.version(version)
.build
diffGraph.addNode(dep)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class AstNodeBuilder[NodeBuilderType](private val diffGraph: DiffGraph.Builder,
.name(Option(name).getOrElse("<n/a>"))
.dependencyGroupId(Option(groupId).getOrElse("<n/a>"))
.version(Option(version).getOrElse("<n/a>"))
.build
diffGraph.addNode(dependency)
dependency
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ class NewCompositeNode(underlying: ListBuffer[NewNode] = ListBuffer.empty[NewNod

override def properties: Map[String, Any] = ??? // we do not need this

override def canEqual(that: Any): Boolean =
that.isInstanceOf[NewCompositeNode]

override def productArity: Int = 0

override def productElement(n: Int): Any = null

override def copy: this.type = {
val newInstance = new NewCompositeNode(underlying.clone())
newInstance.asInstanceOf[this.type]
}

def add(newNode: NewNode): Unit = {
underlying.append(newNode)
}
Expand Down

0 comments on commit 3f57322

Please sign in to comment.