Fixed build after rebasing with master. We should use ${scala.binary.version} instead of just 2.10
Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/eeed1a68 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/eeed1a68 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/eeed1a68 Branch: refs/heads/scala-2.11-prashant Commit: eeed1a68f01538abfcc1007f9e25f8e34b76e554 Parents: c696f39 Author: Prashant Sharma <prashan...@imaginea.com> Authored: Wed Nov 5 15:57:30 2014 +0530 Committer: Prashant Sharma <prashan...@imaginea.com> Committed: Fri Nov 7 11:22:47 2014 +0530 ---------------------------------------------------------------------- core/pom.xml | 4 ++-- network/shuffle/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/eeed1a68/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index afa8c8c..d71f265 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -74,12 +74,12 @@ </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-network-common_2.10</artifactId> + <artifactId>spark-network-common_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-network-shuffle_2.10</artifactId> + <artifactId>spark-network-shuffle_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/eeed1a68/network/shuffle/pom.xml ---------------------------------------------------------------------- diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml index fe5681d..662212f 100644 --- a/network/shuffle/pom.xml +++ b/network/shuffle/pom.xml @@ -39,7 +39,7 @@ <!-- Core dependencies --> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-network-common_2.10</artifactId> + <artifactId>spark-network-common_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -58,7 +58,7 @@ <!-- Test dependencies --> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-network-common_2.10</artifactId> + <artifactId>spark-network-common_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org