diff options
author | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-15 12:10:31 -0700 |
---|---|---|
committer | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-16 13:50:12 -0700 |
commit | 353fab2440dbf1369df20393e0377de2b327de72 (patch) | |
tree | c68c5ff891a6cf80e923254dda9bd07bdeea18a2 /tools | |
parent | 8add2d7a59c59e72539da86a58b9c2980843f1e0 (diff) | |
download | spark-353fab2440dbf1369df20393e0377de2b327de72.tar.gz spark-353fab2440dbf1369df20393e0377de2b327de72.tar.bz2 spark-353fab2440dbf1369df20393e0377de2b327de72.zip |
Initial changes to make Maven build agnostic of hadoop version
Diffstat (limited to 'tools')
-rw-r--r-- | tools/pom.xml | 53 |
1 files changed, 15 insertions, 38 deletions
diff --git a/tools/pom.xml b/tools/pom.xml index 878eb82f18..c123c2ab23 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -32,6 +32,21 @@ <dependencies> <dependency> + <groupId>org.spark-project</groupId> + <artifactId>spark-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.spark-project</groupId> + <artifactId>spark-streaming</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.version}</artifactId> <scope>test</scope> @@ -59,39 +74,6 @@ <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.spark-project</groupId> - <artifactId>spark-streaming</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> @@ -108,11 +90,6 @@ </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> |