diff --git a/bagel/pom.xml b/bagel/pom.xml index a8256a6e8b0ea32bc028b3404c40fa70b81363e2..5f5834720428974ca1f485838555235db7a13651 100644 --- a/bagel/pom.xml +++ b/bagel/pom.xml @@ -45,6 +45,11 @@ <profiles> <profile> <id>hadoop1</id> + <activation> + <property> + <name>!hadoopVersion</name> + </property> + </activation> <dependencies> <dependency> <groupId>org.spark-project</groupId> @@ -72,6 +77,12 @@ </profile> <profile> <id>hadoop2</id> + <activation> + <property> + <name>hadoopVersion</name> + <value>2</value> + </property> + </activation> <dependencies> <dependency> <groupId>org.spark-project</groupId> diff --git a/core/pom.xml b/core/pom.xml index ae52c20657b5448140d97813e8eae7286135a38f..ad9fdcde2c6a4e13ab4c3808a7c42e26d7608e16 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -159,6 +159,11 @@ <profiles> <profile> <id>hadoop1</id> + <activation> + <property> + <name>!hadoopVersion</name> + </property> + </activation> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -211,6 +216,12 @@ </profile> <profile> <id>hadoop2</id> + <activation> + <property> + <name>hadoopVersion</name> + <value>2</value> + </property> + </activation> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -267,4 +278,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project> diff --git a/examples/pom.xml b/examples/pom.xml index 782c026d736b968371c1200e4d0f4d69ae1fabcb..3355deb6b77cd03006fe239a0ec991c82e875c6e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -45,6 +45,11 @@ <profiles> <profile> <id>hadoop1</id> + <activation> + <property> + <name>!hadoopVersion</name> + </property> + </activation> <dependencies> <dependency> <groupId>org.spark-project</groupId> @@ -72,6 +77,12 @@ </profile> <profile> <id>hadoop2</id> + <activation> + <property> + <name>hadoopVersion</name> + <value>2</value> + </property> + </activation> <dependencies> <dependency> <groupId>org.spark-project</groupId> diff --git a/pom.xml b/pom.xml index fe5b1d0ee4b3568713af2651a04b184b44d1ee9e..8f1af673a351e54ea5a2bb2dd3d3f5a8423aea84 100644 --- a/pom.xml +++ b/pom.xml @@ -481,6 +481,12 @@ <profiles> <profile> <id>hadoop1</id> + <activation> + <property> + <name>!hadoopVersion</name> + </property> + </activation> + <properties> <hadoop.major.version>1</hadoop.major.version> </properties> @@ -497,6 +503,12 @@ <profile> <id>hadoop2</id> + <activation> + <property> + <name>hadoopVersion</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 0667b71cc7bba49a22a2c12d7f9c590dc30ea78c..da91c0f3ab2b1d598a9e33561e88d75a025c7812 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -70,6 +70,11 @@ <profiles> <profile> <id>hadoop1</id> + <activation> + <property> + <name>!hadoopVersion</name> + </property> + </activation> <properties> <classifier>hadoop1</classifier> </properties> @@ -110,6 +115,12 @@ </profile> <profile> <id>hadoop2</id> + <activation> + <property> + <name>hadoopVersion</name> + <value>2</value> + </property> + </activation> <properties> <classifier>hadoop2</classifier> </properties> diff --git a/repl/pom.xml b/repl/pom.xml index 114e3e9932f4eebcf28f012a7d3410560fc2c003..38e883c7f84b8a433c7f1d8dbbd537af5de56441 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -72,6 +72,11 @@ <profiles> <profile> <id>hadoop1</id> + <activation> + <property> + <name>!hadoopVersion</name> + </property> + </activation> <properties> <classifier>hadoop1</classifier> </properties> @@ -116,6 +121,12 @@ </profile> <profile> <id>hadoop2</id> + <activation> + <property> + <name>hadoopVersion</name> + <value>2</value> + </property> + </activation> <properties> <classifier>hadoop2</classifier> </properties>