Skip to content

Commit

Permalink
Updated akka version to 2.3.11, added exclusion rule for org.jboss.ne…
Browse files Browse the repository at this point in the history
…tty (old 3.2.2.Final version) that causes conflicts
  • Loading branch information
Chip Senkbeil committed Sep 17, 2015
1 parent 9bd0662 commit cd20431
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
6 changes: 3 additions & 3 deletions communication/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
libraryDependencies ++= Seq(
// LGPL with static linking exception
"org.zeromq" % "jeromq" % "0.3.4",
"com.typesafe.akka" %% "akka-actor" % "2.3.4",
"com.typesafe.akka" %% "akka-slf4j" % "2.3.4",
"com.typesafe.akka" %% "akka-testkit" % "2.3.4" % "test"
"com.typesafe.akka" %% "akka-actor" % "2.3.11",
"com.typesafe.akka" %% "akka-slf4j" % "2.3.11",
"com.typesafe.akka" %% "akka-testkit" % "2.3.11" % "test"
)
9 changes: 8 additions & 1 deletion kernel-api/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,15 @@ libraryDependencies ++= Seq(
// TODO: Mark these as provided and bring them in via the kernel project
// so users wanting to implement a magic do not bring in Spark itself
libraryDependencies ++= Seq(
"org.apache.spark" %% "spark-core" % sparkVersion.value excludeAll // Apache v2
"org.apache.spark" %% "spark-core" % sparkVersion.value excludeAll( // Apache v2
ExclusionRule(organization = "org.apache.hadoop"),

// Exclude netty (org.jboss.netty is for 3.2.2.Final only)
ExclusionRule(
organization = "org.jboss.netty",
name = "netty"
)
),
"org.apache.spark" %% "spark-streaming" % sparkVersion.value, // Apache v2
"org.apache.spark" %% "spark-sql" % sparkVersion.value, // Apache v2
"org.apache.spark" %% "spark-mllib" % sparkVersion.value, // Apache v2
Expand Down

0 comments on commit cd20431

Please sign in to comment.