From bbc56d85ed4eb4c3a09b20d5457f704f4b8a70c4 Mon Sep 17 00:00:00 2001
From: Shivaram Venkataraman <shivaram@eecs.berkeley.edu>
Date: Sat, 12 Jan 2013 15:24:13 -0800
Subject: Rename environment variable for hadoop profiles to hadoopVersion

---
 bagel/pom.xml    | 4 ++--
 core/pom.xml     | 4 ++--
 examples/pom.xml | 4 ++--
 pom.xml          | 5 +++--
 repl-bin/pom.xml | 4 ++--
 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>
diff --git a/pom.xml b/pom.xml
index ae87813d4e..8f1af673a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
-- 
cgit v1.2.3