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.

Sign up for GitHub

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

Jump to bottom

CORE-69: swagger-ui webjar to 5.18.2 #352

Merged
merged 4 commits into from
Nov 14, 2024
Merged

CORE-69: swagger-ui webjar to 5.18.2 #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23050ca
Update swagger-ui to 5.18.2
broadbot Nov 10, 2024
5594649
Merge branch 'develop' into update/swagger-ui-5.18.2
davidangb Nov 13, 2024
7b71601
also update path to swagger-ui resources
davidangb Nov 13, 2024
1cbdfd7
Merge branch 'develop' into da_CORE-69_updateSwaggerUi
davidangb Nov 14, 2024
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 build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resolvers ++= Seq(
"Broad Artifactory Snapshots" at "https://broadinstitute.jfrog.io/broadinstitute/libs-snapshot/")

libraryDependencies ++= Seq(
"org.webjars" % "swagger-ui" % "5.17.14",
"org.webjars" % "swagger-ui" % "5.18.2",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
"com.typesafe.akka" %% "akka-http-spray-json" % "10.2.9",
"com.google.protobuf" % "protobuf-java" % "4.29.0-RC2",
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/thurloe/service/ThurloeServiceActor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ThurloeServiceActor(httpSamDao: SamDAO) extends FireCloudProtectedServices
val samDao = httpSamDao
override val dataAccess = ThurloeDatabaseConnector
override val sendGridDAO = new HttpSendGridDAO(samDao)
protected val swaggerUiPath = "META-INF/resources/webjars/swagger-ui/5.17.14"
private val swaggerUiPath = "META-INF/resources/webjars/swagger-ui/5.18.2"

def route: Route = addCSP {
swaggerUiService ~ statusRoute ~ fireCloudProtectedRoutes
Expand Down
Loading