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 /pom.xml | |
| 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 'pom.xml')
| -rw-r--r-- | pom.xml | 32 |
1 files changed, 11 insertions, 21 deletions
@@ -325,6 +325,17 @@ <version>0.8</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>1.2.1</version> + <exclusions> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> @@ -531,22 +542,6 @@ <profiles> <profile> - <id>hadoop1</id> - <properties> - <hadoop.major.version>1</hadoop.major.version> - </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>1.2.1</version> - </dependency> - </dependencies> - </dependencyManagement> - </profile> - - <profile> <id>hadoop2</id> <properties> <hadoop.major.version>2</hadoop.major.version> @@ -555,11 +550,6 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>2.0.0-mr1-cdh${cdh.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>2.0.0-mr1-cdh${cdh.version}</version> </dependency> |