aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnkur Dave <ankurdave@gmail.com>2014-01-10 10:34:40 -0800
committerAnkur Dave <ankurdave@gmail.com>2014-01-10 10:34:40 -0800
commit1b2aad918c6893c73779856e9a0c6fb934e3d65f (patch)
treed538f611a0613f8ff92c111a0fdf83a3ecef8b20
parent23d2995116b876cf50a3fc19d2d6a68449a23472 (diff)
downloadspark-1b2aad918c6893c73779856e9a0c6fb934e3d65f.tar.gz
spark-1b2aad918c6893c73779856e9a0c6fb934e3d65f.tar.bz2
spark-1b2aad918c6893c73779856e9a0c6fb934e3d65f.zip
Update graphx/pom.xml to mirror mllib/pom.xml
-rw-r--r--graphx/pom.xml76
1 files changed, 7 insertions, 69 deletions
diff --git a/graphx/pom.xml b/graphx/pom.xml
index fd3dcaad7c..3e5faf230d 100644
--- a/graphx/pom.xml
+++ b/graphx/pom.xml
@@ -26,15 +26,15 @@
</parent>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-graph_2.9.3</artifactId>
+ <artifactId>spark-graphx_2.10</artifactId>
<packaging>jar</packaging>
- <name>Spark Graph</name>
+ <name>Spark Project GraphX</name>
<url>http://spark-project.org/</url>
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.9.3</artifactId>
+ <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -45,18 +45,18 @@
<dependency>
<groupId>org.scalatest</groupId>
- <artifactId>scalatest_${scala.version}</artifactId>
+ <artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>
- <artifactId>scalacheck_${scala.version}</artifactId>
+ <artifactId>scalacheck_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
- <outputDirectory>target/scala-${scala.version}/classes</outputDirectory>
- <testOutputDirectory>target/scala-${scala.version}/test-classes</testOutputDirectory>
+ <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
+ <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
<plugins>
<plugin>
<groupId>org.scalatest</groupId>
@@ -64,66 +64,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>hadoop1</id>
- <dependencies>
- <dependency>
- <groupId>org.spark-project</groupId>
- <artifactId>spark-core</artifactId>
- <version>${project.version}</version>
- <classifier>hadoop1</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <classifier>hadoop1</classifier>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>hadoop2</id>
- <dependencies>
- <dependency>
- <groupId>org.spark-project</groupId>
- <artifactId>spark-core</artifactId>
- <version>${project.version}</version>
- <classifier>hadoop2</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <classifier>hadoop2</classifier>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>