Skip to content

Commit

Permalink
Merge branch 'main' into upgrade-jwt-scala
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning authored Oct 7, 2023
2 parents bbf6714 + ce2b214 commit 4e0db9e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ object Dependencies {
val CouchbaseVersion = "2.7.16"
val CouchbaseVersionForDocs = "2.7"

val GoogleAuthVersion = "1.20.0"
val JwtScalaVersion = "9.4.4"

val log4jOverSlf4jVersion = "1.7.36"
Expand Down Expand Up @@ -195,7 +196,7 @@ object Dependencies {
"org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
"org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
"com.github.jwt-scala" %% "jwt-json-common" % JwtScalaVersion, // ApacheV2
"com.google.auth" % "google-auth-library-credentials" % "0.24.1", // BSD 3-clause
"com.google.auth" % "google-auth-library-credentials" % GoogleAuthVersion, // BSD 3-clause
"io.specto" % "hoverfly-java" % hoverflyVersion % Test // ApacheV2
) ++ Mockito)

Expand Down Expand Up @@ -236,7 +237,7 @@ object Dependencies {
// https://github.com/googleapis/java-pubsub/tree/master/proto-google-cloud-pubsub-v1/
"com.google.cloud" % "google-cloud-pubsub" % "1.112.5" % "protobuf-src",
"io.grpc" % "grpc-auth" % org.apache.pekko.grpc.gen.BuildInfo.grpcVersion,
"com.google.auth" % "google-auth-library-oauth2-http" % "0.22.2",
"com.google.auth" % "google-auth-library-oauth2-http" % GoogleAuthVersion,
"com.google.protobuf" % "protobuf-java" % protobufJavaVersion,
// pull in Pekko Discovery for our Pekko version
"org.apache.pekko" %% "pekko-discovery" % PekkoVersion))
Expand Down

0 comments on commit 4e0db9e

Please sign in to comment.