diff options
author | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-01-08 03:19:43 -0800 |
---|---|---|
committer | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-01-08 03:19:43 -0800 |
commit | f7adb382ace7f54c5093bf90574b3f9dd0d35534 (patch) | |
tree | 3b89d051dced0d182d453e7671981cd217416684 | |
parent | 4bbe07e5ece81fa874d2412bcc165179313a7619 (diff) | |
download | spark-f7adb382ace7f54c5093bf90574b3f9dd0d35534.tar.gz spark-f7adb382ace7f54c5093bf90574b3f9dd0d35534.tar.bz2 spark-f7adb382ace7f54c5093bf90574b3f9dd0d35534.zip |
Activate hadoop1 if property hadoop is missing. hadoop2 can be activated now
by using -Dhadoop -Phadoop2.
-rw-r--r-- | bagel/pom.xml | 4 | ||||
-rw-r--r-- | core/pom.xml | 4 | ||||
-rw-r--r-- | examples/pom.xml | 4 | ||||
-rw-r--r-- | pom.xml | 4 | ||||
-rw-r--r-- | repl-bin/pom.xml | 4 | ||||
-rw-r--r-- | repl/pom.xml | 4 |
6 files changed, 18 insertions, 6 deletions
diff --git a/bagel/pom.xml b/bagel/pom.xml index 4ca643bbb7..85b2077026 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -46,7 +46,9 @@ <profile> <id>hadoop1</id> <activation> - <activeByDefault>true</activeByDefault> + <property> + <name>!hadoop</name> + </property> </activation> <dependencies> <dependency> diff --git a/core/pom.xml b/core/pom.xml index cd789a7db0..005d8fe498 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -160,7 +160,9 @@ <profile> <id>hadoop1</id> <activation> - <activeByDefault>true</activeByDefault> + <property> + <name>!hadoop</name> + </property> </activation> <dependencies> <dependency> diff --git a/examples/pom.xml b/examples/pom.xml index 9e638c8284..3f738a3f8c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -46,7 +46,9 @@ <profile> <id>hadoop1</id> <activation> - <activeByDefault>true</activeByDefault> + <property> + <name>!hadoop</name> + </property> </activation> <dependencies> <dependency> @@ -482,7 +482,9 @@ <profile> <id>hadoop1</id> <activation> - <activeByDefault>true</activeByDefault> + <property> + <name>!hadoop</name> + </property> </activation> <properties> <hadoop.major.version>1</hadoop.major.version> diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index aa9895eda2..fecb01f3cd 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -71,7 +71,9 @@ <profile> <id>hadoop1</id> <activation> - <activeByDefault>true</activeByDefault> + <property> + <name>!hadoop</name> + </property> </activation> <properties> <classifier>hadoop1</classifier> diff --git a/repl/pom.xml b/repl/pom.xml index ba7a051310..04b2c35beb 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -73,7 +73,9 @@ <profile> <id>hadoop1</id> <activation> - <activeByDefault>true</activeByDefault> + <property> + <name>!hadoop</name> + </property> </activation> <properties> <classifier>hadoop1</classifier> |