From 4bbe07e5ece81fa874d2412bcc165179313a7619 Mon Sep 17 00:00:00 2001
From: Shivaram Venkataraman <shivaram@eecs.berkeley.edu>
Date: Mon, 7 Jan 2013 17:46:22 -0800
Subject: Activate hadoop1 profile by default for maven builds

---
 bagel/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bagel')

diff --git a/bagel/pom.xml b/bagel/pom.xml
index a8256a6e8b..4ca643bbb7 100644
--- a/bagel/pom.xml
+++ b/bagel/pom.xml
@@ -45,6 +45,9 @@
   <profiles>
     <profile>
       <id>hadoop1</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.spark-project</groupId>
-- 
cgit v1.2.3


From f7adb382ace7f54c5093bf90574b3f9dd0d35534 Mon Sep 17 00:00:00 2001
From: Shivaram Venkataraman <shivaram@eecs.berkeley.edu>
Date: Tue, 8 Jan 2013 03:19:43 -0800
Subject: Activate hadoop1 if property hadoop is missing. hadoop2 can be
 activated now by using -Dhadoop -Phadoop2.

---
 bagel/pom.xml    | 4 +++-
 core/pom.xml     | 4 +++-
 examples/pom.xml | 4 +++-
 pom.xml          | 4 +++-
 repl-bin/pom.xml | 4 +++-
 repl/pom.xml     | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'bagel')

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>
diff --git a/pom.xml b/pom.xml
index 0e2d93c170..ea5b9c9d05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
-- 
cgit v1.2.3


From 92625223066a5c28553d7710c6b14af56f64b560 Mon Sep 17 00:00:00 2001
From: Shivaram Venkataraman <shivaram@eecs.berkeley.edu>
Date: Thu, 10 Jan 2013 22:07:34 -0800
Subject: Activate hadoop2 profile in pom.xml with -Dhadoop=2

---
 bagel/pom.xml    | 6 ++++++
 core/pom.xml     | 6 ++++++
 examples/pom.xml | 6 ++++++
 pom.xml          | 6 ++++++
 repl-bin/pom.xml | 6 ++++++
 repl/pom.xml     | 6 ++++++
 6 files changed, 36 insertions(+)

(limited to 'bagel')

diff --git a/bagel/pom.xml b/bagel/pom.xml
index 85b2077026..c3461fb889 100644
--- a/bagel/pom.xml
+++ b/bagel/pom.xml
@@ -77,6 +77,12 @@
     </profile>
     <profile>
       <id>hadoop2</id>
+      <activation>
+        <property>
+          <name>hadoop</name>
+          <value>2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.spark-project</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 005d8fe498..c8ff625774 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -216,6 +216,12 @@
     </profile>
     <profile>
       <id>hadoop2</id>
+      <activation>
+        <property>
+          <name>hadoop</name>
+          <value>2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 3f738a3f8c..d0b1e97747 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -77,6 +77,12 @@
     </profile>
     <profile>
       <id>hadoop2</id>
+      <activation>
+        <property>
+          <name>hadoop</name>
+          <value>2</value>
+        </property>
+      </activation>
       <dependencies>
         <dependency>
           <groupId>org.spark-project</groupId>
diff --git a/pom.xml b/pom.xml
index ea5b9c9d05..ae87813d4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,6 +502,12 @@
 
     <profile>
       <id>hadoop2</id>
+      <activation>
+        <property>
+          <name>hadoop</name>
+          <value>2</value>
+        </property>
+      </activation>
       <properties>
         <hadoop.major.version>2</hadoop.major.version>
       </properties>
diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml
index fecb01f3cd..54ae20659e 100644
--- a/repl-bin/pom.xml
+++ b/repl-bin/pom.xml
@@ -115,6 +115,12 @@
     </profile>
     <profile>
       <id>hadoop2</id>
+      <activation>
+        <property>
+          <name>hadoop</name>
+          <value>2</value>
+        </property>
+      </activation>
       <properties>
         <classifier>hadoop2</classifier>
       </properties>
diff --git a/repl/pom.xml b/repl/pom.xml
index 04b2c35beb..3e979b93a6 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -121,6 +121,12 @@
     </profile>
     <profile>
       <id>hadoop2</id>
+      <activation>
+        <property>
+          <name>hadoop</name>
+          <value>2</value>
+        </property>
+      </activation>
       <properties>
         <classifier>hadoop2</classifier>
       </properties>
-- 
cgit v1.2.3


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(-)

(limited to 'bagel')

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