Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import sbt._
object Dependencies {
val akkaV = "2.6.20"
val akkaHttpV = "10.2.10"
val slickV = "3.6.0"
val slickV = "3.6.1"

val googleV = "2.0.0" // service-specific client libraries
val googleApiV = "2.7.2" // the main google-api-client
val googleApiV = "2.8.0" // the main google-api-client

def excludeGuavaJDK5(m: ModuleID): ModuleID = m.exclude("com.google.guava", "guava-jdk5")

Expand Down Expand Up @@ -59,14 +59,14 @@ object Dependencies {
// rawlsCoreDependencies, does not need these. As of this writing, metrics4-scala and metrics3-statsd are only
// needed by the metrics subproject of Rawls.
// metrics-scala transitively pulls in io.dropwizard.metrics:metrics-core
val metricsScala: ModuleID = "nl.grons" %% "metrics4-scala" % "4.3.3"
val metricsScala: ModuleID = "nl.grons" %% "metrics4-scala" % "4.3.4"
val metricsStatsd: ModuleID = "com.readytalk" % "metrics3-statsd" % "4.2.0"

val scalaLogging: ModuleID = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"
val jacksonCore: ModuleID = "com.fasterxml.jackson.core" % "jackson-core" % "2.19.0"
val jodaTime: ModuleID = "joda-time" % "joda-time" % "2.14.0"
val typesafeConfig: ModuleID = "com.typesafe" % "config" % "1.4.3"
val sentryLogback: ModuleID = "io.sentry" % "sentry-logback" % "8.11.1"
val sentryLogback: ModuleID = "io.sentry" % "sentry-logback" % "8.13.2"
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 All @@ -81,7 +81,7 @@ object Dependencies {
val antlrParser: ModuleID = "org.antlr" % "antlr4-runtime" % "4.13.2"
// protobuf is only need to use the MySQL X DevAPI which we don't. exclude it to avoid interference with Google client libraries
val mysqlConnector: ModuleID = "com.mysql" % "mysql-connector-j" % "9.3.0" exclude("com.google.protobuf", "protobuf-java")
val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.31.1"
val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.32.0"
val jakartaWsRs: ModuleID = "jakarta.ws.rs" % "jakarta.ws.rs-api" % "4.0.0"
val jerseyJnhConnector: ModuleID = "org.glassfish.jersey.connectors" % "jersey-jnh-connector" % "3.1.10"

Expand All @@ -106,13 +106,13 @@ 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.34" % "test"
val googleStorageLocal: ModuleID = "com.google.cloud" % "google-cloud-nio" % "0.127.36" % "test"

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

val circeYAML: ModuleID = "io.circe" %% "circe-yaml" % "1.15.0"

val azureIdentity: ModuleID = "com.azure" % "azure-identity" % "1.15.4"
val azureIdentity: ModuleID = "com.azure" % "azure-identity" % "1.16.1"
val azureCoreManagement: ModuleID = "com.azure" % "azure-core-management" % "1.17.0"

def excludeOpenTelemetry = ExclusionRule("io.opentelemetry.instrumentation")
Expand All @@ -129,10 +129,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.1187-SNAPSHOT")
val workspaceManager = clientLibExclusions("bio.terra" % "workspace-manager-client" % "0.254.1190-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.618-SNAPSHOT")
val billingProfileManager = clientLibExclusions("bio.terra" % "billing-profile-manager-client" % "0.1.619-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.392")
val leonardo: ModuleID = "org.broadinstitute.dsde.workbench" % "leonardo-client_2.13" % "1.3.6-2e87300"
Expand All @@ -150,7 +150,7 @@ object Dependencies {
val kindProjector = compilerPlugin(("org.typelevel" %% "kind-projector" % "0.13.3").cross(CrossVersion.full))
val betterMonadicFor = compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1")

val openApiParser: ModuleID = "io.swagger.parser.v3" % "swagger-parser-v3" % "2.1.26"
val openApiParser: ModuleID = "io.swagger.parser.v3" % "swagger-parser-v3" % "2.1.29"

// Overrides for transitive dependencies. These apply - via Settings.scala - to all projects in this codebase.
// These are overrides only; if the direct dependencies stop including any of these, they will not be included
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.11.1
sbt.version=1.11.1
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.3")

addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3")

addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")

Expand Down
Loading