diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4396da3f63..153150bedf 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -53,7 +53,6 @@ object Dependencies { val excludeKms = ExclusionRule(organization = "com.google.cloud", name = s"google-cloud-kms") val excludeBigQuery = ExclusionRule(organization = "com.google.cloud", name = "google-cloud-bigquery") val excludeCloudBilling = ExclusionRule(organization = "com.google.cloud", name = "google-cloud-billing") - val excludeOpentelemetrySpringBoot = ExclusionRule(organization = "io.opentelemetry.instrumentation", name = "opentelemetry-spring-boot-2.3.0-alpha") val jose4j: ModuleID = "org.bitbucket.b_c" % "jose4j" % "0.9.4" @@ -109,8 +108,7 @@ object Dependencies { val workbenchAzureTest: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-azure" % workbenchAzureV % "test" classifier "tests" val workbenchOpenTelemetry: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-opentelemetry" % workbenchOpenTelemetryV excludeAll ( excludeIoGrpc, - excludeGuava, - excludeOpentelemetrySpringBoot + excludeGuava ) val workbenchOpenTelemetryTest: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-opentelemetry" % workbenchOpenTelemetryV % Test classifier "tests" excludeAll (excludeGuava) @@ -153,9 +151,12 @@ object Dependencies { def excludeBroadWorkbench = ExclusionRule("org.broadinstitute.dsde.workbench") def excludePostgresql = ExclusionRule("org.postgresql", "postgresql") def excludeSnakeyaml = ExclusionRule("org.yaml", "snakeyaml") + def excludeLiquibase = ExclusionRule("org.liquibase", "liquibase-core") + + // [IA-4939] commons-text:1.9 is unsafe def excludeCommonsText = ExclusionRule("org.apache.commons", "commons-text") - def tclExclusions(m: ModuleID): ModuleID = m.excludeAll(excludeSpringBoot, excludeSpringAop, excludeSpringData, excludeSpringFramework, excludeOpenCensus, excludeGoogleFindBugs, excludeBroadWorkbench, excludePostgresql, excludeSnakeyaml, excludeSlf4j, excludeCommonsText, excludeOpentelemetrySpringBoot) + def tclExclusions(m: ModuleID): ModuleID = m.excludeAll(excludeSpringBoot, excludeSpringAop, excludeSpringData, excludeSpringFramework, excludeOpenCensus, excludeGoogleFindBugs, excludeBroadWorkbench, excludePostgresql, excludeSnakeyaml, excludeSlf4j, excludeCommonsText, excludeLiquibase) val workspaceManager = excludeJakarta("bio.terra" % "workspace-manager-client" % workSpaceManagerV) val bpm = excludeJakarta("bio.terra" % "billing-profile-manager-client" % bpmV) val terraCommonLib = tclExclusions(excludeJakarta("bio.terra" % "terra-common-lib" % terraCommonLibV classifier "plain"))