diff options
| author | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-01-12 15:24:13 -0800 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-01-12 15:24:13 -0800 |
| commit | bbc56d85ed4eb4c3a09b20d5457f704f4b8a70c4 (patch) | |
| tree | 95c24ad79872a4140db2d6047b7e1c718c3f4899 | |
| parent | 92625223066a5c28553d7710c6b14af56f64b560 (diff) | |
| download | spark-bbc56d85ed4eb4c3a09b20d5457f704f4b8a70c4.tar.gz spark-bbc56d85ed4eb4c3a09b20d5457f704f4b8a70c4.tar.bz2 spark-bbc56d85ed4eb4c3a09b20d5457f704f4b8a70c4.zip | |
Rename environment variable for hadoop profiles to hadoopVersion
| -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 | 5 | ||||
| -rw-r--r-- | repl-bin/pom.xml | 4 | ||||
| -rw-r--r-- | repl/pom.xml | 4 |
6 files changed, 13 insertions, 12 deletions
diff --git a/bagel/pom.xml b/bagel/pom.xml index c3461fb889..5f58347204 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -47,7 +47,7 @@ <id>hadoop1</id> <activation> <property> - <name>!hadoop</name> + <name>!hadoopVersion</name> </property> </activation> <dependencies> @@ -79,7 +79,7 @@ <id>hadoop2</id> <activation> <property> - <name>hadoop</name> + <name>hadoopVersion</name> <value>2</value> </property> </activation> diff --git a/core/pom.xml b/core/pom.xml index c8ff625774..ad9fdcde2c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -161,7 +161,7 @@ <id>hadoop1</id> <activation> <property> - <name>!hadoop</name> + <name>!hadoopVersion</name> </property> </activation> <dependencies> @@ -218,7 +218,7 @@ <id>hadoop2</id> <activation> <property> - <name>hadoop</name> + <name>hadoopVersion</name> <value>2</value> </property> </activation> diff --git a/examples/pom.xml b/examples/pom.xml index d0b1e97747..3355deb6b7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -47,7 +47,7 @@ <id>hadoop1</id> <activation> <property> - <name>!hadoop</name> + <name>!hadoopVersion</name> </property> </activation> <dependencies> @@ -79,7 +79,7 @@ <id>hadoop2</id> <activation> <property> - <name>hadoop</name> + <name>hadoopVersion</name> <value>2</value> </property> </activation> @@ -483,9 +483,10 @@ <id>hadoop1</id> <activation> <property> - <name>!hadoop</name> + <name>!hadoopVersion</name> </property> </activation> + <properties> <hadoop.major.version>1</hadoop.major.version> </properties> @@ -504,7 +505,7 @@ <id>hadoop2</id> <activation> <property> - <name>hadoop</name> + <name>hadoopVersion</name> <value>2</value> </property> </activation> diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 54ae20659e..da91c0f3ab 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -72,7 +72,7 @@ <id>hadoop1</id> <activation> <property> - <name>!hadoop</name> + <name>!hadoopVersion</name> </property> </activation> <properties> @@ -117,7 +117,7 @@ <id>hadoop2</id> <activation> <property> - <name>hadoop</name> + <name>hadoopVersion</name> <value>2</value> </property> </activation> diff --git a/repl/pom.xml b/repl/pom.xml index 3e979b93a6..38e883c7f8 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -74,7 +74,7 @@ <id>hadoop1</id> <activation> <property> - <name>!hadoop</name> + <name>!hadoopVersion</name> </property> </activation> <properties> @@ -123,7 +123,7 @@ <id>hadoop2</id> <activation> <property> - <name>hadoop</name> + <name>hadoopVersion</name> <value>2</value> </property> </activation> |