diff options
author | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
---|---|---|
committer | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
commit | 383e151fd7138cc6a143b3a38037cc3038c2a8b9 (patch) | |
tree | 0dbb2c0d8fdeff4c37a577eb96acb87ee7838a16 /yarn | |
parent | 20c65bc334091d8d05fb680551155aa182d98f7d (diff) | |
parent | c4c1db2dd5b2ec0a8182369ecdb0e14f4e199822 (diff) | |
download | spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.gz spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.bz2 spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.zip |
Merge branch 'master' of git://github.com/mesos/spark into scala-2.10
Conflicts:
core/src/main/scala/org/apache/spark/SparkContext.scala
project/SparkBuild.scala
Diffstat (limited to 'yarn')
-rw-r--r-- | yarn/pom.xml | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/yarn/pom.xml b/yarn/pom.xml index 654b5bcd2d..21b650d1ea 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -30,6 +30,39 @@ <name>Spark Project YARN Support</name> <url>http://spark.incubator.apache.org/</url> + <dependencies> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${yarn.version}</version> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro-ipc</artifactId> + </dependency> + </dependencies> + <build> <outputDirectory>target/scala-${scala.version}/classes</outputDirectory> <testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory> @@ -75,37 +108,4 @@ </plugin> </plugins> </build> - - <profiles> - <profile> - <id>hadoop2-yarn</id> - <dependencies> - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-ipc</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> </project> |