Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AJ-2020 swagger UI csp testing #4790

Closed
wants to merge 4 commits into from
Closed
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ object Dependencies {
val workbenchGoogleV = s"0.32-$workbenchLibsHash"
val workbenchGoogle2V = s"0.36-$workbenchLibsHash"
val workbenchOpenTelemetryV = s"0.8-$workbenchLibsHash"
val workbenchOauth2V = s"0.7-$workbenchLibsHash"
val workbenchOauth2V = "0.8-cc0fc60d-SNAP" //s"0.7-$workbenchLibsHash"
val workbenchAzureV = s"0.8-$workbenchLibsHash"

val helmScalaSdkV = "0.0.8.5"
Expand Down Expand Up @@ -53,6 +53,7 @@ object Dependencies {
val excludeKms = ExclusionRule(organization = "com.google.cloud", name = s"google-cloud-kms")
val excludeBigQuery = ExclusionRule(organization = "com.google.cloud", name = "google-cloud-bigquery")
val excludeCloudBilling = ExclusionRule(organization = "com.google.cloud", name = "google-cloud-billing")
val excludeWorkbenchUtils2 = ExclusionRule(organization = "org.broadinstitute.dsde.workbench", name = s"workbench-util2_${scalaV}")

val jose4j: ModuleID = "org.bitbucket.b_c" % "jose4j" % "0.9.4"

Expand Down Expand Up @@ -101,8 +102,8 @@ object Dependencies {
excludeGuava
)
val workbenchAzure: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-azure" % workbenchAzureV
val workbenchOauth2: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % workbenchOauth2V
val workbenchOauth2Tests: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % workbenchOauth2V % "test" classifier "tests"
val workbenchOauth2: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % workbenchOauth2V excludeAll (excludeWorkbenchUtils2)
val workbenchOauth2Tests: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % workbenchOauth2V % "test" classifier "tests" excludeAll (excludeWorkbenchUtils2)
val workbenchGoogleTest: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-google" % workbenchGoogleV % "test" classifier "tests" excludeAll (excludeGuava, excludeStatsD)
val workbenchGoogle2Test: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-google2" % workbenchGoogle2V % "test" classifier "tests" excludeAll (excludeGuava) //for generators
val workbenchAzureTest: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-azure" % workbenchAzureV % "test" classifier "tests"
Expand Down
Loading