Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6a4237f
CORE-69: Update terra-common-lib from 1.1.68-SNAPSHOT to 1.1.79-SNAPSHOT
broadbot Oct 1, 2026
2090f6c
CORE-69: Update sbt-scalafix from 0.14.5 to 0.14.9
broadbot Oct 1, 2026
fee8a87
CORE-69: Update logback-classic from 1.5.23 to 1.5.38
broadbot Oct 1, 2026
87f21d5
CORE-69: Update sbt-assembly from 2.3.1 to 2.5.0
broadbot Oct 1, 2026
76ca9ba
CORE-69: Update jackson-core from 2.22.1 to 2.22.3
broadbot Oct 1, 2026
482b1f4
CORE-69: Update google-cloud-nio from 0.128.9 to 0.128.14
broadbot Oct 1, 2026
a975b3f
CORE-69: Update guava from 33.5.0-jre to 33.7.2-jre
broadbot Oct 1, 2026
c32af25
CORE-69: Update okio from 3.16.4 to 3.18.2
broadbot Oct 1, 2026
fdc8de1
CORE-69: Update commons-codec from 1.20.0 to 1.22.1
broadbot Oct 1, 2026
140178f
CORE-69: Update grpc-core from 1.78.0 to 1.84.0
broadbot Oct 1, 2026
bbe4508
CORE-69: Update reactor-netty from 1.2.13 to 1.2.18
broadbot Oct 1, 2026
a49d038
CORE-69: Update mockito-scala-scalatest from 2.0.0 to 2.2.3
broadbot Oct 1, 2026
76ce47c
CORE-69: Update postgresql from 42.7.8 to 42.7.13
broadbot Oct 1, 2026
60bbd32
CORE-69: Update sbt from 1.11.7 to 1.13.0
broadbot Oct 1, 2026
24d0dbf
CORE-69: Update scalacheck from 1.19.0 to 1.20.0
broadbot Oct 1, 2026
f42333c
CORE-69: Update sbt-scalafmt from 2.5.6 to 2.6.2
broadbot Oct 1, 2026
ee6f05c
CORE-69: Update scalatest from 3.2.19 to 3.2.20
broadbot Oct 1, 2026
4ef6015
CORE-69: Update sbt-scoverage from 2.4.3 to 2.4.4
broadbot Oct 1, 2026
95f7aac
CORE-69: Update jackson-core from 3.2.1 to 3.2.3
broadbot Oct 1, 2026
7a745d5
CORE-69: Update jackson-databind from 3.2.1 to 3.2.3
broadbot Oct 1, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/verify_consumer_pacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ jobs:
-e JANITOR_CLIENT_CREDENTIAL_FILE_PATH="" \
-e JANITOR_TRACK_RESOURCE_PROJECT_ID="" \
-e JANITOR_TRACK_RESOURCE_TOPIC_ID="" \
sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.11.7_2.13.18 \
sbtscala/scala-sbt:eclipse-temurin-17.0.15_6_1.13.0_2.13.18 \
bash -c "git config --global --add safe.directory /working/sam && sbt \"set scalafmtOnCompile := false\" \"project pact4s\" \"testOnly *SamProviderSpec\""

can-i-deploy: # The can-i-deploy job will run as a result of a Sam PR. It reports the pact verification statuses on all deployed environments.
Expand Down
4 changes: 2 additions & 2 deletions automation/project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import sbt._
object Dependencies {
val scalaV = "2.13"

val jacksonV = "2.22.1"
val jacksonV = "2.22.3"
val jacksonAnnotationsV = "2.22"
val akkaV = "2.6.19"
val akkaHttpV = "10.2.2"
Expand Down Expand Up @@ -45,7 +45,7 @@ object Dependencies {
"com.typesafe.akka" %% "akka-testkit" % akkaV % "test",
"com.typesafe.akka" %% "akka-slf4j" % akkaV,
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.6",
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
"org.scalatest" %% "scalatest" % "3.2.20" % Test,
"org.scalatestplus" %% "scalacheck-1-18" % "3.2.19.0" % Test,
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.4",
workbenchServiceTest,
Expand Down
30 changes: 15 additions & 15 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import sbt._
object Dependencies {
val akkaV = "2.6.19"
val akkaHttpV = "10.2.9"
val jacksonV = "2.22.1"
val jacksonV = "2.22.3"
val jacksonAnnotationsV = "2.22"
val scalaLoggingV = "3.9.6"
val scalaTestV = "3.2.19"
val scalaCheckV = "1.19.0"
val scalaTestV = "3.2.20"
val scalaCheckV = "1.20.0"
val scalikejdbcVersion = "3.4.2"
val postgresDriverVersion = "42.7.8"
val postgresDriverVersion = "42.7.13"
val sentryVersion = "6.15.0"
val nettyV = "4.2.16.Final"

Expand All @@ -23,7 +23,7 @@ object Dependencies {
val workbenchOauth2V = s"0.11-$workbenchLibV"
val monocleVersion = "2.0.5"
val crlVersion = "1.2.42-SNAPSHOT"
val tclVersion = "1.1.68-SNAPSHOT"
val tclVersion = "1.1.79-SNAPSHOT"
val slf4jVersion = "2.0.6"

val excludeAkkaActor = ExclusionRule(organization = "com.typesafe.akka", name = "akka-actor_2.12")
Expand All @@ -49,7 +49,7 @@ object Dependencies {
val jacksonCore: ModuleID = "com.fasterxml.jackson.core" % "jackson-core" % jacksonV

val logstashLogback: ModuleID = "net.logstash.logback" % "logstash-logback-encoder" % "9.0"
val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.5.23"
val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.5.38"

val ravenLogback: ModuleID = "com.getsentry.raven" % "raven-logback" % "7.8.6"
val scalaLogging: ModuleID = "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingV
Expand All @@ -67,10 +67,10 @@ object Dependencies {
val akkaHttpTestKit: ModuleID = "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpV % "test"
val scalaCheck: ModuleID = "org.scalacheck" %% "scalacheck" % scalaCheckV % "test"

val reactorNetty: ModuleID = "io.projectreactor.netty" % "reactor-netty" % "1.2.13"
val reactorNetty: ModuleID = "io.projectreactor.netty" % "reactor-netty" % "1.2.18"

val excludIoGrpc = ExclusionRule(organization = "io.grpc", name = "grpc-core")
val ioGrpc: ModuleID = "io.grpc" % "grpc-core" % "1.78.0"
val ioGrpc: ModuleID = "io.grpc" % "grpc-core" % "1.84.0"

val googleOAuth2: ModuleID = "com.google.auth" % "google-auth-library-oauth2-http" % "0.18.0" excludeAll excludIoGrpc
val googleStorage: ModuleID = "com.google.apis" % "google-api-services-storage" % "v1-rev20250925-2.0.0" excludeAll excludIoGrpc // force this version
Expand All @@ -80,7 +80,7 @@ object Dependencies {

val scalaTest: ModuleID = "org.scalatest" %% "scalatest" % scalaTestV % "test"
val scalaTestScalaCheck = "org.scalatestplus" %% "scalacheck-1-18" % s"${scalaTestV}.0" % Test
val mockitoScalaTest = "org.mockito" %% "mockito-scala-scalatest" % "2.0.0" % Test
val mockitoScalaTest = "org.mockito" %% "mockito-scala-scalatest" % "2.2.3" % Test

// All of workbench-libs pull in Akka; exclude it since we provide our own Akka dependency.
// workbench-google pulls in workbench-{util, model, metrics}; exclude them so we can control the library versions individually.
Expand Down Expand Up @@ -116,7 +116,7 @@ object Dependencies {
excludeWorkbenchModel
)
val googleStorageLocal: ModuleID =
"com.google.cloud" % "google-cloud-nio" % "0.128.9" % "test" // needed for mocking google cloud storage. Should use same version as wb-libs
"com.google.cloud" % "google-cloud-nio" % "0.128.14" % "test" // needed for mocking google cloud storage. Should use same version as wb-libs

val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.33.0"

Expand All @@ -131,7 +131,7 @@ object Dependencies {
val slf4jApi: ModuleID = "org.slf4j" % "slf4j-api" % slf4jVersion
val slf4jSimple: ModuleID = "org.slf4j" % "slf4j-simple" % slf4jVersion

val okio: ModuleID = "com.squareup.okio" % "okio" % "3.16.4" excludeAll excludeWorkbenchUtil2
val okio: ModuleID = "com.squareup.okio" % "okio" % "3.18.2" excludeAll excludeWorkbenchUtil2

// pact deps
val pact4sV = "0.9.0"
Expand Down Expand Up @@ -189,7 +189,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.20.0"
val commonsCodec: ModuleID = "commons-codec" % "commons-codec" % "1.22.1"

val rootDependencies = Seq(
// proactively pull in latest versions of Jackson libs, instead of relying on the versions
Expand Down Expand Up @@ -247,10 +247,10 @@ object Dependencies {
// Needed because it looks like the dependency overrides of wb-libs doesn't propagate to the importing project...
val rootDependencyOverrides = Seq(
"org.apache.commons" % "commons-compress" % "1.28.0",
"com.google.guava" % "guava" % "33.5.0-jre", // Force JRE version, not Android version from grpc-core
"com.google.guava" % "guava" % "33.7.2-jre", // Force JRE version, not Android version from grpc-core
// Jackson 2 and Jackson 3 co-exist. Set versions for both:
"tools.jackson.core" % "jackson-core" % "3.2.1",
"tools.jackson.core" % "jackson-databind" % "3.2.1",
"tools.jackson.core" % "jackson-core" % "3.2.3",
"tools.jackson.core" % "jackson-databind" % "3.2.3",
jacksonCore,
jacksonAnnotations,
jacksonDatabind,
Expand Down
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.5.0")

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

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.2")

addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.5")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.9")

addDependencyTreePlugin
Loading