You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2017/01/31 23:48:37 UTC

[5/6] incubator-toree git commit: Update Play JSON to version 2.5.9

Update Play JSON to version 2.5.9


Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/dffc3253
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/dffc3253
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/dffc3253

Branch: refs/heads/sandbox
Commit: dffc3253abf14ef51ac99f48f8da46c1981b8ac3
Parents: 055712b
Author: Luciano Resende <lr...@apache.org>
Authored: Fri Jan 27 14:04:46 2017 -0800
Committer: Luciano Resende <lr...@apache.org>
Committed: Sun Jan 29 00:09:05 2017 -0800

----------------------------------------------------------------------
 kernel/build.sbt   | 4 ++++
 protocol/build.sbt | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/dffc3253/kernel/build.sbt
----------------------------------------------------------------------
diff --git a/kernel/build.sbt b/kernel/build.sbt
index 0965dce..52ba9cf 100644
--- a/kernel/build.sbt
+++ b/kernel/build.sbt
@@ -18,6 +18,10 @@
 //
 // TEST DEPENDENCIES
 //
+
+libraryDependencies +=
+  "com.typesafe.play" %% "play-json" % "2.5.9"
+
 libraryDependencies +=
   "com.typesafe.akka" %% "akka-testkit" % "2.4.8" % "test" // MIT
 

http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/dffc3253/protocol/build.sbt
----------------------------------------------------------------------
diff --git a/protocol/build.sbt b/protocol/build.sbt
index f82b465..cff5969 100644
--- a/protocol/build.sbt
+++ b/protocol/build.sbt
@@ -19,8 +19,8 @@
 // JSON DEPENDENCIES
 //
 libraryDependencies ++= Seq(
-  "com.typesafe.play" %% "play-json" % "2.3.10" excludeAll( // Apache v2
-      ExclusionRule(organization = "com.fasterxml.jackson.core")
+  "com.typesafe.play" %% "play-json" % "2.5.9" excludeAll( // Apache v2
+      //ExclusionRule(organization = "com.fasterxml.jackson.core")
     ),
   "org.slf4j" % "slf4j-api" % "1.7.21" // MIT
 )