Skip to content

Commit

Permalink
Merge branch 'develop' into update/google-api-services-admin-director…
Browse files Browse the repository at this point in the history
…y-directory_v1-rev20240304-2.0.0
  • Loading branch information
davidangb authored Mar 12, 2024
2 parents b52f20d + c53581f commit 908f96a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion automation/project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object Dependencies {
val rootDependencies: Seq[ModuleID] = Seq(
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonV,
"net.virtual-void" %% "json-lenses" % "0.6.2" % "test",
"ch.qos.logback" % "logback-classic" % "1.5.2",
"ch.qos.logback" % "logback-classic" % "1.5.3",
"com.typesafe.akka" %% "akka-http-core" % akkaHttpV,
"com.typesafe.akka" %% "akka-stream-testkit" % akkaV,
"com.typesafe.akka" %% "akka-http" % akkaHttpV,
Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ object Dependencies {
// END transitive dependency overrides

// elasticsearch requires log4j, but we redirect log4j to logback
"org.apache.logging.log4j" % "log4j-to-slf4j" % "2.23.0",
"ch.qos.logback" % "logback-classic" % "1.5.2",
"io.sentry" % "sentry-logback" % "7.5.0",
"org.apache.logging.log4j" % "log4j-to-slf4j" % "2.23.1",
"ch.qos.logback" % "logback-classic" % "1.5.3",
"io.sentry" % "sentry-logback" % "7.6.0",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",

"org.parboiled" % "parboiled-core" % "1.4.1",
Expand Down Expand Up @@ -97,7 +97,7 @@ object Dependencies {
// jaxb-api needed by WorkspaceApiServiceSpec.bagitService() method
"javax.xml.bind" % "jaxb-api" % "2.3.1" % "test",
// provides testing mocks
"com.google.cloud" % "google-cloud-nio" % "0.127.13" % "test",
"com.google.cloud" % "google-cloud-nio" % "0.127.14" % "test",
"org.scalatestplus" %% "mockito-4-5" % "3.2.12.0" % "test"
)
}

0 comments on commit 908f96a

Please sign in to comment.