Repository: falcon Updated Branches: refs/heads/master 004e612d4 -> e7ab83618
http://git-wip-us.apache.org/repos/asf/falcon/blob/e7ab8361/test-util/pom.xml ---------------------------------------------------------------------- diff --git a/test-util/pom.xml b/test-util/pom.xml index 9f60119..baff8c3 100644 --- a/test-util/pom.xml +++ b/test-util/pom.xml @@ -31,51 +31,42 @@ <name>Apache Falcon Test Utility</name> <packaging>jar</packaging> - <profiles> - <profile> - <id>hadoop-2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <classifier>tests</classifier> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> <dependencies> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <classifier>tests</classifier> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <classifier>tests</classifier> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + + <dependency> <groupId>org.apache.falcon</groupId> <artifactId>falcon-client</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/e7ab8361/unit/pom.xml ---------------------------------------------------------------------- diff --git a/unit/pom.xml b/unit/pom.xml index 436249b..4902fcc 100644 --- a/unit/pom.xml +++ b/unit/pom.xml @@ -30,27 +30,18 @@ <description>Apache Falcon Unit Module</description> <name>Apache Falcon Unit</name> <packaging>jar</packaging> - - <profiles> - <profile> - <id>hadoop-2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <hadoop.version>2.7.1</hadoop.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> + + <properties> + <hadoop.version>2.7.1</hadoop.version> + </properties> + <dependencies> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + <dependency> <groupId>org.apache.falcon</groupId> <artifactId>falcon-common</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/e7ab8361/unit/src/main/java/org/apache/falcon/unit/FalconUnitHelper.java ---------------------------------------------------------------------- diff --git a/unit/src/main/java/org/apache/falcon/unit/FalconUnitHelper.java b/unit/src/main/java/org/apache/falcon/unit/FalconUnitHelper.java index 604a3f9..e31a750 100644 --- a/unit/src/main/java/org/apache/falcon/unit/FalconUnitHelper.java +++ b/unit/src/main/java/org/apache/falcon/unit/FalconUnitHelper.java @@ -97,4 +97,3 @@ public final class FalconUnitHelper { } } } - http://git-wip-us.apache.org/repos/asf/falcon/blob/e7ab8361/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index ca1ff18..67c4acf 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -60,23 +60,7 @@ </plugins> </build> </profile> - <profile> - <id>hadoop-2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - </dependencies> - </profile> + <profile> <id>hivedr</id> <dependencies> @@ -110,6 +94,18 @@ </profiles> <dependencies> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> <groupId>org.apache.falcon</groupId> <artifactId>falcon-unit</artifactId>
