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 /mllib | |
| 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 'mllib')
| -rw-r--r-- | mllib/pom.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mllib/pom.xml b/mllib/pom.xml index f4190148b1..a57bddeff3 100644 --- a/mllib/pom.xml +++ b/mllib/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-mllib</artifactId> + <artifactId>spark-mllib_${scala-short.version}</artifactId> <packaging>jar</packaging> <name>Spark Project ML Library</name> <url>http://spark.incubator.apache.org/</url> @@ -34,7 +34,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> @@ -48,12 +48,12 @@ </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> + <artifactId>scalatest_${scala-short.version}</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.scalacheck</groupId> - <artifactId>scalacheck_2.10</artifactId> + <artifactId>scalacheck_${scala-short.version}</artifactId> <scope>test</scope> </dependency> <dependency> |