You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lb...@apache.org on 2016/10/20 13:41:48 UTC
incubator-toree git commit: make jackson a test-only dependency
Repository: incubator-toree
Updated Branches:
refs/heads/master e8ecd0623 -> 1ed5821bb
make jackson a test-only dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/1ed5821b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/1ed5821b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/1ed5821b
Branch: refs/heads/master
Commit: 1ed5821bbd000cc37b555e473a124a79931860ef
Parents: e8ecd06
Author: Oliver K�th <ok...@de.ibm.com>
Authored: Thu Oct 20 09:56:58 2016 +0200
Committer: Gino Bustelo <lb...@apache.org>
Committed: Thu Oct 20 08:41:36 2016 -0500
----------------------------------------------------------------------
project/common.scala | 4 +++-
protocol/build.sbt | 3 +--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/1ed5821b/project/common.scala
----------------------------------------------------------------------
diff --git a/project/common.scala b/project/common.scala
index a8bd8b0..560ff4a 100644
--- a/project/common.scala
+++ b/project/common.scala
@@ -146,7 +146,9 @@ object Common {
// Test dependencies
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "2.2.6" % "test", // Apache v2
- "org.mockito" % "mockito-all" % "1.10.19" % "test" // MIT
+ "org.mockito" % "mockito-all" % "1.10.19" % "test", // MIT
+ // use the same jackson version in test than the one provided at runtime by Spark 2.0.0
+ "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.5" % "test" // Apache v2
),
ScoverageSbtPlugin.ScoverageKeys.coverageHighlighting := false,
pomExtra :=
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/1ed5821b/protocol/build.sbt
----------------------------------------------------------------------
diff --git a/protocol/build.sbt b/protocol/build.sbt
index 731761a..f82b465 100644
--- a/protocol/build.sbt
+++ b/protocol/build.sbt
@@ -29,6 +29,5 @@ libraryDependencies ++= Seq(
// TEST DEPENDENCIES
//
libraryDependencies ++= Seq(
- "org.scalactic" %% "scalactic" % "2.2.6" % "test", // Apache v2
- "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.4" // Apache v2
+ "org.scalactic" %% "scalactic" % "2.2.6" % "test" // Apache v2
)