From c665c075ccaded5cdb4eff07c1f1731e9f0b9e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sitko?= Date: Wed, 15 Jun 2022 09:11:11 +0200 Subject: [PATCH 1/2] Workaround for dependency resolution issue --- joern-cli/frontends/c2cpg/build.sbt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/joern-cli/frontends/c2cpg/build.sbt b/joern-cli/frontends/c2cpg/build.sbt index 8c182996a226..4ca41b8f116e 100644 --- a/joern-cli/frontends/c2cpg/build.sbt +++ b/joern-cli/frontends/c2cpg/build.sbt @@ -13,6 +13,9 @@ libraryDependencies ++= Seq( "org.scalatest" %% "scalatest" % Versions.scalatest % Test ) +// A temporary (hopefully) workaround for https://github.com/eclipse-equinox/equinox.bundles/issues/54 +dependencyOverrides += "org.eclipse.platform" % "org.eclipse.equinox.preferences" % "3.9.100" + Test / packageBin / publishArtifact := true Compile / doc / scalacOptions ++= Seq("-doc-title", "semanticcpg apidocs", "-doc-version", version.value) From f03d107002fa5484c6c97305c8ab0f1de11e95f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sitko?= Date: Wed, 15 Jun 2022 09:55:56 +0200 Subject: [PATCH 2/2] Workaround for dependency resolution issue --- console/build.sbt | 3 +++ joern-cli/build.sbt | 3 +++ querydb/build.sbt | 3 +++ 3 files changed, 9 insertions(+) diff --git a/console/build.sbt b/console/build.sbt index f000cadb7142..1ea6a154012c 100644 --- a/console/build.sbt +++ b/console/build.sbt @@ -31,6 +31,9 @@ libraryDependencies ++= Seq( "org.scalatest" %% "scalatest" % Versions.scalatest % Test ) +// A temporary (hopefully) workaround for https://github.com/eclipse-equinox/equinox.bundles/issues/54 +dependencyOverrides += "org.eclipse.platform" % "org.eclipse.equinox.preferences" % "3.9.100" + Test / packageBin / publishArtifact := true scalacOptions ++= Seq( diff --git a/joern-cli/build.sbt b/joern-cli/build.sbt index f08ef183324e..ad29e42c8f94 100644 --- a/joern-cli/build.sbt +++ b/joern-cli/build.sbt @@ -13,6 +13,9 @@ libraryDependencies ++= Seq( "org.scalatest" %% "scalatest" % Versions.scalatest % Test ) +// A temporary (hopefully) workaround for https://github.com/eclipse-equinox/equinox.bundles/issues/54 +dependencyOverrides += "org.eclipse.platform" % "org.eclipse.equinox.preferences" % "3.9.100" + enablePlugins(UniversalPlugin) enablePlugins(JavaAppPackaging) //wildcard import from staged `lib` dir, for simplicity and also to avoid `line too long` error on windows diff --git a/querydb/build.sbt b/querydb/build.sbt index 3d5b7d438c35..b20f90baddea 100644 --- a/querydb/build.sbt +++ b/querydb/build.sbt @@ -19,6 +19,9 @@ libraryDependencies ++= Seq( "org.scalatest" %% "scalatest" % Versions.scalatest % Test ) +// A temporary (hopefully) workaround for https://github.com/eclipse-equinox/equinox.bundles/issues/54 +dependencyOverrides += "org.eclipse.platform" % "org.eclipse.equinox.preferences" % "3.9.100" + topLevelDirectory := Some(name.value) lazy val createDistribution = taskKey[File]("Create binary distribution of extension")