PDIO-196 Use twitter/chill 0.2.2 to fix kryo version collision

gijs · Jul 15, 2013 · a5efa3c · a5efa3c
1 parent 23e3c38
commit a5efa3c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 26 deletions.
diff --git a/commons/build.sbt b/commons/build.sbt
@@ -12,7 +12,7 @@ scalacOptions in (Compile, doc) ++= Opts.doc.title("PredictionIO Commons API Doc
 
 libraryDependencies ++= Seq(
   "com.github.nscala-time" %% "nscala-time" % "0.2.0",
-  "com.twitter" %% "chill" % "0.2.3",
+  "com.twitter" %% "chill" % "0.2.2",
   "com.typesafe" % "config" % "1.0.0",
   "org.mongodb" %% "casbah" % "2.6.2",
   "org.specs2" %% "specs2" % "1.12.3" % "test"

diff --git a/process/engines/itemrec/algorithms/scala/mahout/build.sbt b/process/engines/itemrec/algorithms/scala/mahout/build.sbt
@@ -23,8 +23,6 @@ mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
   {
     case ("org/xmlpull/v1/XmlPullParser.class") => MergeStrategy.rename
     case ("org/xmlpull/v1/XmlPullParserException.class") => MergeStrategy.rename
-    case "com/esotericsoftware/minlog/Log$Logger.class" => MergeStrategy.last
-    case "com/esotericsoftware/minlog/Log.class" => MergeStrategy.last
     case x => old(x)
   }
 }
diff --git a/process/engines/itemrec/evaluations/scala/paramgen/build.sbt b/process/engines/itemrec/evaluations/scala/paramgen/build.sbt
@@ -19,11 +19,3 @@ libraryDependencies ++= Seq(
 resolvers ++= Seq(
   "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
 )
-
-mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
-  {
-    case "com/esotericsoftware/minlog/Log$Logger.class" => MergeStrategy.last
-    case "com/esotericsoftware/minlog/Log.class" => MergeStrategy.last
-    case x => old(x)
-  }
-}
diff --git a/process/engines/itemrec/evaluations/scala/topkitems/build.sbt b/process/engines/itemrec/evaluations/scala/topkitems/build.sbt
@@ -22,11 +22,3 @@ libraryDependencies ++= Seq(
 resolvers ++= Seq(
   "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
 )
-
-mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
-  {
-    case "com/esotericsoftware/minlog/Log$Logger.class" => MergeStrategy.last
-    case "com/esotericsoftware/minlog/Log.class" => MergeStrategy.last
-    case x => old(x)
-  }
-}
diff --git a/process/engines/itemrec/evaluations/scala/trainingtestsplit/build.sbt b/process/engines/itemrec/evaluations/scala/trainingtestsplit/build.sbt
@@ -18,10 +18,3 @@ resolvers ++= Seq(
   "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
 )
 
-mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
-  {
-    case "com/esotericsoftware/minlog/Log$Logger.class" => MergeStrategy.last
-    case "com/esotericsoftware/minlog/Log.class" => MergeStrategy.last
-    case x => old(x)
-  }
-}