Skip to content
Snippets Groups Projects
Commit 69ae7ea2 authored by Prashant Sharma's avatar Prashant Sharma
Browse files

Removed some unnecessary code and fixed dependencies

parent a5f1f6a9
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# This script computes Spark's classpath and prints it to stdout; it's used by both the "run" # This script computes Spark's classpath and prints it to stdout; it's used by both the "run"
# script and the ExecutorRunner in standalone cluster mode. # script and the ExecutorRunner in standalone cluster mode.
SCALA_VERSION=2.9.3 SCALA_VERSION=2.10
# Figure out where Spark is installed # Figure out where Spark is installed
FWDIR="$(cd `dirname $0`/..; pwd)" FWDIR="$(cd `dirname $0`/..; pwd)"
......
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.scala-incubator.io</groupId> <groupId>com.github.scala-incubator.io</groupId>
<artifactId>scala-io-file_2.9.2</artifactId> <artifactId>scala-io-file_2.10</artifactId>
<version>0.4.1</version> <version>0.4.1</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -161,7 +161,6 @@ object SparkBuild extends Build { ...@@ -161,7 +161,6 @@ object SparkBuild extends Build {
"colt" % "colt" % "1.2.0", "colt" % "colt" % "1.2.0",
"org.apache.mesos" % "mesos" % "0.9.0-incubating", "org.apache.mesos" % "mesos" % "0.9.0-incubating",
"org.apache.derby" % "derby" % "10.4.2.0" % "test", "org.apache.derby" % "derby" % "10.4.2.0" % "test",
"org.scala-lang" % "scala-actors" % "2.10.1",
"org.scala-lang" % "jline" % "2.10.1", "org.scala-lang" % "jline" % "2.10.1",
"org.scala-lang" % "scala-reflect" % "2.10.1" "org.scala-lang" % "scala-reflect" % "2.10.1"
) ++ ( ) ++ (
...@@ -169,19 +168,19 @@ object SparkBuild extends Build { ...@@ -169,19 +168,19 @@ object SparkBuild extends Build {
if (HADOOP_YARN) { if (HADOOP_YARN) {
Seq( Seq(
// Exclude rule required for all ? // Exclude rule required for all ?
"org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty), "org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty),
"org.apache.hadoop" % "hadoop-yarn-api" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty), "org.apache.hadoop" % "hadoop-yarn-api" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty),
"org.apache.hadoop" % "hadoop-yarn-common" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty), "org.apache.hadoop" % "hadoop-yarn-common" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty),
"org.apache.hadoop" % "hadoop-yarn-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty) "org.apache.hadoop" % "hadoop-yarn-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty)
) )
} else { } else {
Seq( Seq(
"org.apache.hadoop" % "hadoop-core" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty), "org.apache.hadoop" % "hadoop-core" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty),
"org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty) "org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty)
) )
} }
} else { } else {
Seq("org.apache.hadoop" % "hadoop-core" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty) ) Seq("org.apache.hadoop" % "hadoop-core" % HADOOP_VERSION excludeAll(excludeJackson, excludeNetty) )
}), }),
unmanagedSourceDirectories in Compile <+= baseDirectory{ _ / unmanagedSourceDirectories in Compile <+= baseDirectory{ _ /
( if (HADOOP_YARN && HADOOP_MAJOR_VERSION == "2") { ( if (HADOOP_YARN && HADOOP_MAJOR_VERSION == "2") {
...@@ -222,9 +221,6 @@ object SparkBuild extends Build { ...@@ -222,9 +221,6 @@ object SparkBuild extends Build {
def streamingSettings = sharedSettings ++ Seq( def streamingSettings = sharedSettings ++ Seq(
name := "spark-streaming", name := "spark-streaming",
resolvers ++= Seq(
"Akka Repository" at "http://repo.akka.io/releases/"
),
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty), "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile" excludeAll(excludeNetty),
"com.github.sgroschupf" % "zkclient" % "0.1", "com.github.sgroschupf" % "zkclient" % "0.1",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment