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 /streaming | |
| 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 'streaming')
| -rw-r--r-- | streaming/pom.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/streaming/pom.xml b/streaming/pom.xml index 8367256004..3f2033f34a 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,12 +21,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-streaming</artifactId> + <artifactId>spark-streaming_${scala-short.version}</artifactId> <packaging>jar</packaging> <name>Spark Project Streaming</name> <url>http://spark.incubator.apache.org/</url> @@ -42,7 +42,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> @@ -58,6 +58,7 @@ <groupId>org.apache.kafka</groupId> <artifactId>kafka</artifactId> <version>0.7.2-spark</version> <!-- Comes from our in-project repository --> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flume</groupId> |