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: [PATCH] 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(-)
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>
--
GitLab