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

Bump finatra to 20.5.0 and jackson 2.10 #48

Closed
wants to merge 2 commits into from
Closed

Bump finatra to 20.5.0 and jackson 2.10 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c944fa
bump finatra to 20.5.0 and jackson 2.10
kimxogus May 28, 2020
73fb4a3
bump version
kimxogus May 28, 2020
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
54 changes: 46 additions & 8 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ crossScalaVersions := Seq("2.11.12", "2.12.11")

Global / onChangedBuildSource := ReloadOnSourceChanges

lazy val twitterReleaseVersion = "20.4.1"
lazy val twitterReleaseVersion = "20.5.0"
lazy val jacksonVersion = "2.10.4"

lazy val swaggerUIVersion = SettingKey[String]("swaggerUIVersion")

Expand All @@ -19,20 +20,57 @@ buildInfoPackage := "com.jakehschwartz.finatra.swagger"
buildInfoKeys := Seq[BuildInfoKey](name, version, swaggerUIVersion)

libraryDependencies ++= Seq(
"com.twitter" %% "finatra-http" % twitterReleaseVersion,
"io.swagger" % "swagger-core" % "1.5.23",
"com.twitter" %% "finatra-http" % twitterReleaseVersion excludeAll(
"com.fasterxml.jackson.core",
"com.fasterxml.jackson.dataformat",
"com.fasterxml.jackson.datatype",
"com.fasterxml.jackson.module"
),
"io.swagger" % "swagger-core" % "1.6.1",
"io.swagger" %% "swagger-scala-module" % "1.0.6",
"com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion,
"com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion,
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion,
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonVersion,
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % jacksonVersion,
"com.fasterxml.jackson.module" % "jackson-module-paranamer" % jacksonVersion,
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion,
"org.webjars" % "swagger-ui" % swaggerUIVersion.value,
"net.bytebuddy" % "byte-buddy" % "1.10.5",
"org.scalatest" %% "scalatest" % "3.0.8" % Test
)

val examplesTestLibs = Seq(
"com.twitter" %% "finatra-http" % twitterReleaseVersion % "test" classifier "tests",
"com.twitter" %% "inject-app" % twitterReleaseVersion % "test" classifier "tests",
"com.twitter" %% "inject-core" % twitterReleaseVersion % "test" classifier "tests",
"com.twitter" %% "inject-modules" % twitterReleaseVersion % "test" classifier "tests",
"com.twitter" %% "inject-server" % twitterReleaseVersion % "test" classifier "tests",
"com.twitter" %% "finatra-http" % twitterReleaseVersion % "test" classifier "tests" excludeAll(
"com.fasterxml.jackson.core",
"com.fasterxml.jackson.dataformat",
"com.fasterxml.jackson.datatype",
"com.fasterxml.jackson.module"
),
"com.twitter" %% "inject-app" % twitterReleaseVersion % "test" classifier "tests" excludeAll(
"com.fasterxml.jackson.core",
"com.fasterxml.jackson.dataformat",
"com.fasterxml.jackson.datatype",
"com.fasterxml.jackson.module"
),
"com.twitter" %% "inject-core" % twitterReleaseVersion % "test" classifier "tests" excludeAll(
"com.fasterxml.jackson.core",
"com.fasterxml.jackson.dataformat",
"com.fasterxml.jackson.datatype",
"com.fasterxml.jackson.module"
),
"com.twitter" %% "inject-modules" % twitterReleaseVersion % "test" classifier "tests" excludeAll(
"com.fasterxml.jackson.core",
"com.fasterxml.jackson.dataformat",
"com.fasterxml.jackson.datatype",
"com.fasterxml.jackson.module"
),
"com.twitter" %% "inject-server" % twitterReleaseVersion % "test" classifier "tests" excludeAll(
"com.fasterxml.jackson.core",
"com.fasterxml.jackson.dataformat",
"com.fasterxml.jackson.datatype",
"com.fasterxml.jackson.module"
),
"ch.qos.logback" % "logback-classic" % "1.2.3",
"org.scalatest" %% "scalatest" % "3.0.8" % Test,
"org.mockito" % "mockito-all" % "1.10.19" % Test
Expand Down
3 changes: 1 addition & 2 deletions ...les/hello-world/src/test/scala/com/jakehschwartz/finatra/swagger/DocsControllerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class DocsControllerTest extends SampleAppBaseTest {
s"/docs/swagger-ui/${BuildInfo.swaggerUIVersion}/index.html?url=/swagger.json"

test("sampleController: docs endpoint should return 307") {
val expectedLocation: String =
s"http://${server.externalHttpHostAndPort}$swaggerUrl"
val expectedLocation: String = swaggerUrl
val response: Response =
server.httpGet("/docs", andExpect = Status.TemporaryRedirect)
response.headerMap("Location") shouldBe expectedLocation
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version := "20.4.1"
version := "20.5.0-SNAPSHOT"