Skip to content

Commit

Permalink
Merge branch 'develop' into update/google-api-services-storage-v1-rev…
Browse files Browse the repository at this point in the history
…20241008-2.0.0
  • Loading branch information
calypsomatic authored Nov 8, 2024
2 parents 32dc5d7 + 50e89e7 commit d722682
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object Dependencies {
val scalaTestV = "3.2.19"
val scalaCheckV = "1.18.1"
val scalikejdbcVersion = "3.4.2"
val postgresDriverVersion = "42.7.2"
val postgresDriverVersion = "42.7.4"
val sentryVersion = "6.15.0"

val workbenchLibV = "fa46370" // If updating this, make sure googleStorageLocal in test dependencies is up-to-date
Expand Down Expand Up @@ -53,7 +53,7 @@ object Dependencies {
val ficus: ModuleID = "com.iheart" %% "ficus" % "1.5.2"
// val stackdriverLogging: ModuleID = "org.springframework.cloud" % "spring-cloud-gcp-logging" % "1.2.8.RELEASE" excludeAll(excludeSpring, excludeSpringBoot)
val stackdriverLogging: ModuleID = "com.google.cloud" % "google-cloud-logging-logback" % "0.127.11-alpha"
val janino: ModuleID = "org.codehaus.janino" % "janino" % "3.1.7" // For if-else logic in logging config
val janino: ModuleID = "org.codehaus.janino" % "janino" % "3.1.12" // For if-else logic in logging config

val akkaActor: ModuleID = "com.typesafe.akka" %% "akka-actor" % akkaV
val akkaSlf4j: ModuleID = "com.typesafe.akka" %% "akka-slf4j" % akkaV
Expand Down Expand Up @@ -169,7 +169,7 @@ object Dependencies {
val terraCommonLib = tclExclusions("bio.terra" % "terra-common-lib" % tclVersion classifier "plain")

// was included transitively before, now explicit
val commonsCodec: ModuleID = "commons-codec" % "commons-codec" % "1.15"
val commonsCodec: ModuleID = "commons-codec" % "commons-codec" % "1.17.1"

val rootDependencies = Seq(
// proactively pull in latest versions of Jackson libs, instead of relying on the versions
Expand Down

0 comments on commit d722682

Please sign in to comment.