diff --git a/build.sbt b/build.sbt index 4f1abbcc124..19894c0f45b 100644 --- a/build.sbt +++ b/build.sbt @@ -339,7 +339,7 @@ lazy val docs = project("docs") case akka.Doc.BinVer(_) => "" case _ => "cross CrossVersion.full" }), - "jackson.version" -> Dependencies.jacksonVersion, + "jackson.version" -> Dependencies.jacksonXmlVersion, "extref.akka-docs.base_url" -> s"https://doc.akka.io/docs/akka/${AkkaDependency.akkaVersion}/%s", "extref.akka25-docs.base_url" -> s"https://doc.akka.io/docs/akka/2.5/%s", "javadoc.akka.http.base_url" -> { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e5eed7cd44d..f36058ff989 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,8 @@ import scala.language.implicitConversions object Dependencies { import DependencyHelpers._ - val jacksonVersion = "2.9.9" + val jacksonDatabindVersion = "2.9.9.3" + val jacksonXmlVersion = "2.9.9" val junitVersion = "4.12" val h2specVersion = "1.5.0" val h2specName = s"h2spec_${DependencyHelpers.osName}_amd64" @@ -46,7 +47,7 @@ object Dependencies { val sprayJson = "io.spray" %% "spray-json" % "1.3.5" // ApacheV2 // For akka-http-jackson support - val jackson = "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion // ApacheV2 + val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % jacksonDatabindVersion // ApacheV2 // For akka-http-testkit-java val junit = "junit" % "junit" % junitVersion // Common Public License 1.0 @@ -60,7 +61,7 @@ object Dependencies { object Docs { val sprayJson = Compile.sprayJson % "test" val gson = "com.google.code.gson" % "gson" % "2.8.5" % "test" - val jacksonXml = "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % jacksonVersion % "test" // ApacheV2 + val jacksonXml = "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % jacksonXmlVersion % "test" // ApacheV2 val reflections = "org.reflections" % "reflections" % "0.9.11" % "test" // WTFPL } @@ -123,7 +124,7 @@ object Dependencies { libraryDependencies += Test.scalatest.value ) - lazy val httpJackson = l ++= Seq(jackson) + lazy val httpJackson = l ++= Seq(jacksonDatabind) lazy val docs = l ++= Seq(Docs.sprayJson, Docs.gson, Docs.jacksonXml, Docs.reflections) }