Skip to content

Commit

Permalink
CORE-69: Minor and patch updates - httpclient5 to 5.4.2 - google-clou…
Browse files Browse the repository at this point in the history
…d-nio to 0.127.30 - workspace-manager-client to 0.254.1174-SNAPSHOT - sentry-logback to 7.21.0 - commons-codec to 1.18.0 - billing-profile-manager-client to 0.1.603-SNAPSHOT (#3178)

* CORE-69: Update billing-profile-manager-client from 0.1.602-SNAPSHOT to 0.1.603-SNAPSHOT

* CORE-69: Update workspace-manager-client from 0.254.1172-SNAPSHOT to 0.254.1174-SNAPSHOT

* CORE-69: Update google-cloud-nio from 0.127.29 to 0.127.30

* CORE-69: Update commons-codec from 1.17.2 to 1.18.0

* CORE-69: Update sentry-logback from 7.20.1 to 7.21.0

* CORE-69: Update httpclient5 from 5.4.1 to 5.4.2
  • Loading branch information
broadbot authored Feb 4, 2025
1 parent 23b2551 commit a48e790
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object Dependencies {
val cromwellClient: ModuleID = "org.broadinstitute.cromwell" % "cromwell-client_2.12" % "0.1-8b413b45f-SNAP"

val bardClient: ModuleID = "bio.terra" % "bard-client-resttemplate" % "1.0.9" exclude("org.springframework", "spring-aop") exclude("org.springframework", "spring-jcl")
val httpComponents5: ModuleID = "org.apache.httpcomponents.client5" % "httpclient5" % "5.4.1" // Needed for connection pooling with the Bard client
val httpComponents5: ModuleID = "org.apache.httpcomponents.client5" % "httpclient5" % "5.4.2" // Needed for connection pooling with the Bard client

val googleApiClient: ModuleID = excludeGuavaJDK5("com.google.api-client" % "google-api-client" % googleV)
val googleCloudBilling: ModuleID = excludeGuavaJDK5("com.google.apis" % "google-api-services-cloudbilling" % ("v1-rev20220908-" + googleV))
Expand Down Expand Up @@ -64,7 +64,7 @@ object Dependencies {
val jacksonCore: ModuleID = "com.fasterxml.jackson.core" % "jackson-core" % "2.18.2"
val jodaTime: ModuleID = "joda-time" % "joda-time" % "2.13.0"
val typesafeConfig: ModuleID = "com.typesafe" % "config" % "1.4.3"
val sentryLogback: ModuleID = "io.sentry" % "sentry-logback" % "7.20.1"
val sentryLogback: ModuleID = "io.sentry" % "sentry-logback" % "7.21.0"
val webjarsLocator: ModuleID = "org.webjars" % "webjars-locator" % "0.52"
val commonsJEXL: ModuleID = "org.apache.commons" % "commons-jexl" % "2.1.1"
val cats: ModuleID = "org.typelevel" %% "cats-core" % "2.13.0"
Expand Down Expand Up @@ -104,7 +104,7 @@ object Dependencies {
val workbenchOauth2: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % workbenchOauth2V
val workbenchOauth2Tests: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % workbenchOauth2V % "test" classifier "tests"

val googleStorageLocal: ModuleID = "com.google.cloud" % "google-cloud-nio" % "0.127.29" % "test"
val googleStorageLocal: ModuleID = "com.google.cloud" % "google-cloud-nio" % "0.127.30" % "test"

val workbenchUtil: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-util" % s"0.10-${workbenchLibsHash}"

Expand All @@ -127,10 +127,10 @@ object Dependencies {
// "Terra Common Lib" Exclusions:
def tclExclusions(m: ModuleID): ModuleID = m.excludeAll(excludeSpringBoot, excludeSpringAop, excludeSpringData, excludeSpringFramework, excludeOpenCensus, excludeGoogleFindBugs, excludeBroadWorkbench, excludePostgresql, excludeSnakeyaml, excludeSlf4j)

val workspaceManager = clientLibExclusions("bio.terra" % "workspace-manager-client" % "0.254.1172-SNAPSHOT")
val workspaceManager = clientLibExclusions("bio.terra" % "workspace-manager-client" % "0.254.1174-SNAPSHOT")
val dataRepo = clientLibExclusions("bio.terra" % "datarepo-jakarta-client" % "1.593.0-SNAPSHOT")
val resourceBufferService = clientLibExclusions("bio.terra" % "terra-resource-buffer-client" % "0.198.42-SNAPSHOT")
val billingProfileManager = clientLibExclusions("bio.terra" % "billing-profile-manager-client" % "0.1.602-SNAPSHOT")
val billingProfileManager = clientLibExclusions("bio.terra" % "billing-profile-manager-client" % "0.1.603-SNAPSHOT")
val terraCommonLib = tclExclusions(clientLibExclusions("bio.terra" % "terra-common-lib" % "0.1.23-SNAPSHOT" classifier "plain"))
val sam: ModuleID = clientLibExclusions("org.broadinstitute.dsde.workbench" %% "sam-client" % "v0.0.351")
val leonardo: ModuleID = "org.broadinstitute.dsde.workbench" % "leonardo-client_2.13" % "1.3.6-2e87300"
Expand All @@ -155,7 +155,7 @@ object Dependencies {
// One reason to specify an override here is to avoid static-analysis security warnings.
val transitiveDependencyOverrides = Seq(
// override commons-codec to address a non-CVE warning from DefectDojo
"commons-codec" % "commons-codec" % "1.17.2"
"commons-codec" % "commons-codec" % "1.18.0"
)

val extraOpenTelemetryDependencies = Seq(
Expand Down

0 comments on commit a48e790

Please sign in to comment.