From 702acc9c444e58681b3f6b4dc87f59bf87e56b78 Mon Sep 17 00:00:00 2001 From: David An Date: Mon, 12 Aug 2024 09:52:22 -0400 Subject: [PATCH] move google dependencies to transitiveDependencyOverrides --- project/Dependencies.scala | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index aac33423b..94e9f9ec6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -23,11 +23,13 @@ object Dependencies { // by being listed here. // One reason to specify an override here is to avoid static-analysis security warnings. val transitiveDependencyOverrides: Seq[ModuleID] = Seq( - "com.fasterxml.jackson.core" % "jackson-annotations" % jacksonV, - "com.fasterxml.jackson.core" % "jackson-databind" % jacksonHotfixV, - "com.fasterxml.jackson.core" % "jackson-core" % jacksonV, - "org.yaml" % "snakeyaml" % "1.33", - "org.apache.commons" % "commons-compress" % "1.26.2" // workbench-libs libraries pull this in + "com.fasterxml.jackson.core" % "jackson-annotations" % jacksonV, + "com.fasterxml.jackson.core" % "jackson-databind" % jacksonHotfixV, + "com.fasterxml.jackson.core" % "jackson-core" % jacksonV, + "org.yaml" % "snakeyaml" % "1.33", + "org.apache.commons" % "commons-compress" % "1.26.2", // workbench-libs libraries pull this in + "com.google.apis" % "google-api-services-pubsub" % "v1-rev20240730-2.0.0", // from workbench-google2 + "com.google.apis" % "google-api-services-admin-directory" % "directory_v1-rev20240709-2.0.0" // from workbench-google2 ) val rootDependencies: Seq[ModuleID] = Seq( @@ -82,9 +84,6 @@ object Dependencies { exclude("org.apache.logging.log4j", "log4j-api") exclude("org.apache.logging.log4j", "log4j-core"), - excludeGuava("com.google.apis" % "google-api-services-pubsub" % "v1-rev20240702-2.0.0"), - excludeGuava("com.google.apis" % "google-api-services-admin-directory" % "directory_v1-rev20240709-2.0.0"), - "com.github.jwt-scala" %% "jwt-core" % "10.0.1", // javax.mail is used only by MethodRepository.validatePublicOrEmail(). Consider // refactoring that method to remove this entire dependency.