diff --git a/README.md b/README.md index ba24ab43b1a10c75ecd697d27fc4b178af59ab69..60f3a7576ca223d3192d685fc9edc0802748064d 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,8 @@ This README file only contains basic setup instructions. ## Building -Spark requires Scala 2.9.2 (Scala 2.10 is not yet supported). The project is -built using Simple Build Tool (SBT), which is packaged with it. To build -Spark and its example programs, run: +Spark requires Scala 2.10. The project is built using Simple Build Tool (SBT), +which is packaged with it. To build Spark and its example programs, run: sbt/sbt package diff --git a/examples/pom.xml b/examples/pom.xml index 270777e29c02774476e439d7d80c3b2fcda981e6..f521e850276565e0911c9d97a2919a1ade1d224e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ </dependency> <dependency> <groupId>com.twitter</groupId> - <artifactId>algebird-core_2.9.2</artifactId> + <artifactId>algebird-core_2.10</artifactId> <version>0.1.11</version> </dependency> <dependency> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 7b61e2ba3eaa3430658b2a7faa50d077a208786e..49c88700197ac30ac1f2075f02085fc61c55d6bf 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -170,7 +170,7 @@ object SparkBuild extends Build { def examplesSettings = sharedSettings ++ Seq( name := "spark-examples", - libraryDependencies ++= Seq("com.twitter" % "algebird-core_2.9.2" % "0.1.11") + libraryDependencies ++= Seq("com.twitter" %% "algebird-core" % "0.1.11") ) def bagelSettings = sharedSettings ++ Seq(name := "spark-bagel") @@ -178,7 +178,7 @@ object SparkBuild extends Build { def streamingSettings = sharedSettings ++ Seq( name := "spark-streaming", libraryDependencies ++= Seq( - "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile", + "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile", "com.github.sgroschupf" % "zkclient" % "0.1", "org.twitter4j" % "twitter4j-stream" % "3.0.3", "com.typesafe.akka" % "akka-zeromq" % "2.1-M1" excludeAll(ExclusionRule(name = "akka-actor"), ExclusionRule(organization = "org.scala-lang")) diff --git a/streaming/pom.xml b/streaming/pom.xml index b0d0cd0ff35ee2e0c5bd63b03f0083b31ceff089..26f0ae951c659acd113135cd4224866ddb2977b3 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -55,7 +55,17 @@ <dependency> <groupId>com.typesafe.akka</groupId> <artifactId>akka-zeromq</artifactId> - <version>2.0.3</version> + <version>2.1-M1</version> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-actor</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.scalatest</groupId>