diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-12 15:38:36 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-12 15:38:36 -0800 |
| commit | 995075bf7930cb372466fb27b0fab71e34da99ec (patch) | |
| tree | e4a892c2ff42f0b855a80beaa02f3fe5fed75b50 /core | |
| parent | 2e914d99835487e867cac6add8be1dbd80dc693f (diff) | |
| parent | bbc56d85ed4eb4c3a09b20d5457f704f4b8a70c4 (diff) | |
| download | spark-995075bf7930cb372466fb27b0fab71e34da99ec.tar.gz spark-995075bf7930cb372466fb27b0fab71e34da99ec.tar.bz2 spark-995075bf7930cb372466fb27b0fab71e34da99ec.zip | |
Merge pull request #355 from shivaram/default-hadoop-pom
Activate hadoop1 profile by default for maven builds
Diffstat (limited to 'core')
| -rw-r--r-- | core/pom.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/core/pom.xml b/core/pom.xml index ae52c20657..ad9fdcde2c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -159,6 +159,11 @@ <profiles> <profile> <id>hadoop1</id> + <activation> + <property> + <name>!hadoopVersion</name> + </property> + </activation> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -211,6 +216,12 @@ </profile> <profile> <id>hadoop2</id> + <activation> + <property> + <name>hadoopVersion</name> + <value>2</value> + </property> + </activation> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -267,4 +278,4 @@ </build> </profile> </profiles> -</project>
\ No newline at end of file +</project> |