Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AJ-1683: update to latest workbench-libs and remove jose4j override #1306

Merged
merged 1 commit into from
Mar 13, 2024
Merged

AJ-1683: update to latest workbench-libs and remove jose4j override #1306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object Dependencies {
val jacksonV = "2.13.5"
val jacksonHotfixV = "2.13.5" // for when only some of the Jackson libs have hotfix releases
val nettyV = "4.1.107.Final"
val workbenchLibsHash = "8ccaa6d" // see https://github.com/broadinstitute/workbench-libs readme for hash values
val workbenchLibsHash = "1c0cf92" // see https://github.com/broadinstitute/workbench-libs readme for hash values

def excludeGuava(m: ModuleID): ModuleID = m.exclude("com.google.guava", "guava")
val excludeAkkaActor = ExclusionRule(organization = "com.typesafe.akka", name = "akka-actor_2.13")
Expand All @@ -23,8 +23,6 @@ object Dependencies {
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonHotfixV,
"com.fasterxml.jackson.core" % "jackson-core" % jacksonV,
"org.yaml" % "snakeyaml" % "1.33",
// workbench-google2 has jose4j as a dependency; directly updating to a non-vulnerable version until workbench-google2 updates
"org.bitbucket.b_c" % "jose4j" % "0.9.3",
"io.grpc" % "grpc-xds" % "1.56.1",
// workbench-google2 has bouncycastle as a dependency; directly updating to a non-vulnerable version until workbench-google2 updates
"org.bouncycastle" % "bcprov-jdk18on" % "1.74"
Expand Down Expand Up @@ -53,7 +51,7 @@ object Dependencies {
exclude("bio.terra", "workspace-manager-client")
excludeAll(excludeAkkaHttp, excludeSprayJson),
excludeGuava("org.broadinstitute.dsde.workbench" %% "workbench-util" % s"0.10-$workbenchLibsHash"),
"org.broadinstitute.dsde.workbench" %% "workbench-google2" % s"0.35-$workbenchLibsHash",
"org.broadinstitute.dsde.workbench" %% "workbench-google2" % s"0.36-$workbenchLibsHash",
"org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % s"0.5-$workbenchLibsHash",
"org.broadinstitute.dsde.workbench" %% "sam-client" % "0.1-ef83073",
"org.broadinstitute.dsde.workbench" %% "workbench-notifications" %s"0.6-$workbenchLibsHash",
Expand Down
Loading