diff options
| author | haitao.yao <yao.erix@gmail.com> | 2013-01-24 10:27:02 +0800 |
|---|---|---|
| committer | haitao.yao <yao.erix@gmail.com> | 2013-01-24 10:27:02 +0800 |
| commit | 97e242067b9d75abd88543c759d8fc0aebd9eb8c (patch) | |
| tree | 550ebeecf7d7edc0b2825561db0e5c835eb16512 /bagel/pom.xml | |
| parent | df9ae8a74e2d42f627a82f9b0a8123a4d54b1d09 (diff) | |
| parent | 548856a22403f6a76d67570db6fa448b2a0e5ad3 (diff) | |
| download | spark-97e242067b9d75abd88543c759d8fc0aebd9eb8c.tar.gz spark-97e242067b9d75abd88543c759d8fc0aebd9eb8c.tar.bz2 spark-97e242067b9d75abd88543c759d8fc0aebd9eb8c.zip | |
Merge branch 'mesos'
Diffstat (limited to 'bagel/pom.xml')
| -rw-r--r-- | bagel/pom.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bagel/pom.xml b/bagel/pom.xml index a8256a6e8b..5f58347204 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -45,6 +45,11 @@ <profiles> <profile> <id>hadoop1</id> + <activation> + <property> + <name>!hadoopVersion</name> + </property> + </activation> <dependencies> <dependency> <groupId>org.spark-project</groupId> @@ -72,6 +77,12 @@ </profile> <profile> <id>hadoop2</id> + <activation> + <property> + <name>hadoopVersion</name> + <value>2</value> + </property> + </activation> <dependencies> <dependency> <groupId>org.spark-project</groupId> |