Activate hadoop1 if property hadoop is missing. hadoop2 can be activa…

…ted now by using -Dhadoop -Phadoop2.
iven · Jan 8, 2013 · f7adb38 · f7adb38
1 parent 4bbe07e
commit f7adb38
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -73,7 +73,9 @@
     <profile>
       <id>hadoop1</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>!hadoop</name>
+        </property>
       </activation>
       <properties>
         <classifier>hadoop1</classifier>