diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-10 09:42:23 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-10 09:42:23 +0530 |
| commit | 26860639c5fee7fc23db1e686f8eb202921e4314 (patch) | |
| tree | e05e555fcd713a7eb15680ae078994d70f396135 /yarn/pom.xml | |
| parent | 7d50f9f87baeb1f4b8d77d669d25649b97dd1d57 (diff) | |
| parent | 7be75682b931dd52014f3cfdc6887e54583ad0af (diff) | |
| download | spark-26860639c5fee7fc23db1e686f8eb202921e4314.tar.gz spark-26860639c5fee7fc23db1e686f8eb202921e4314.tar.bz2 spark-26860639c5fee7fc23db1e686f8eb202921e4314.zip | |
Merge branch 'scala-2.10' of github.com:ScrapCodes/spark into scala-2.10
Conflicts:
core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala
project/SparkBuild.scala
Diffstat (limited to 'yarn/pom.xml')
| -rw-r--r-- | yarn/pom.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/yarn/pom.xml b/yarn/pom.xml index 47e27ee41c..7770cbb0cc 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn</artifactId> + <artifactId>spark-yarn_${scala-short.version}</artifactId> <packaging>jar</packaging> <name>Spark Project YARN Support</name> <url>http://spark.incubator.apache.org/</url> @@ -33,7 +33,7 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core</artifactId> + <artifactId>spark-core_${scala-short.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -97,7 +97,7 @@ </goals> <configuration> <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>reference.conf</resource> </transformer> |