falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srik...@apache.org
Subject git commit: FALCON-106 Falcon compilation fails for hadoop-2 profile. Contributed by Shwetha GS
Date Sun, 15 Dec 2013 16:08:11 GMT
Updated Branches:
  refs/heads/master e4d12b261 -> 3c27e6b89


FALCON-106 Falcon compilation fails for hadoop-2 profile. Contributed by Shwetha GS


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/3c27e6b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/3c27e6b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/3c27e6b8

Branch: refs/heads/master
Commit: 3c27e6b89616c4f61383026d0593a7601d230003
Parents: e4d12b2
Author: srikanth.sundarrajan <srikanth.sundarrajan@inmobi.com>
Authored: Sun Dec 15 18:58:53 2013 +0530
Committer: srikanth.sundarrajan <srikanth.sundarrajan@inmobi.com>
Committed: Sun Dec 15 18:58:53 2013 +0530

----------------------------------------------------------------------
 CHANGES.txt                                     |   3 +
 common/pom.xml                                  |  28 ++-
 docs/src/site/twiki/InstallationSteps.twiki     |   8 +-
 feed/pom.xml                                    |  42 ++++
 hadoop-dependencies/pom.xml                     |  10 -
 hadoop-webapp/pom.xml                           |  24 +-
 .../falcon/listener/HadoopStartupListener.java  |  10 +-
 messaging/pom.xml                               |  28 ++-
 oozie-el-extensions/pom.xml                     |  10 -
 oozie/pom.xml                                   |  10 -
 pom.xml                                         | 241 +++++++++++--------
 prism/pom.xml                                   |  65 +++--
 process/pom.xml                                 |  32 ++-
 replication/pom.xml                             |  10 -
 rerun/pom.xml                                   |  10 -
 retention/pom.xml                               |  42 ++++
 test-util/pom.xml                               |  27 ++-
 webapp/pom.xml                                  | 114 +++++----
 18 files changed, 406 insertions(+), 308 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7684a37..9105d33 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,9 @@ Trunk (Unreleased)
   NEW FEATURES
 
   IMPROVEMENTS
+    FALCON-106 Falcon compilation fails for hadoop-2 profile. (Shwetha GS
+    via Srikanth Sundarrajan)
+
     FALCON-66 Make oozie version change configurable. (Shwetha GS
     via Srikanth Sundarrajan)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 710290c..068a22c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -37,10 +37,6 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -57,17 +53,29 @@
         </profile>
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-client</artifactId>
                 </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
+                 <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-common</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
+                 <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-common</artifactId>
+                 </dependency>
             </dependencies>
         </profile>
     </profiles>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index f2a51b1..b03ad4e 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -9,7 +9,7 @@ git clone https://git-wip-us.apache.org/repos/asf/incubator-falcon.git falcon
 cd falcon
 
 export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install [For hadoop 1]
-export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install -Dhadoop.profile=2 [For hadoop 2]
+export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install -P hadoop-2 [For hadoop 2]
 
 [optionally -Dhadoop.version=<<hadoop.version>> can be appended to build for a specific version of hadoop]
 [optionally -Doozie.version=<<oozie version>> can be appended to build with a specific version of oozie. Oozie versions >= 3.oozie-3.2.0-incubating are supported]
@@ -22,7 +22,7 @@ Once the build successfully completes, artifacts can be packaged for deployment.
 <verbatim>
 
 mvn clean assembly:assembly -DskipTests -DskipCheck=true [For hadoop 1]
-mvn clean assembly:assembly -DskipTests -DskipCheck=true -Dhadoop.profile=2 [For hadoop 2]
+mvn clean assembly:assembly -DskipTests -DskipCheck=true -P hadoop-2 [For hadoop 2]
 
 </verbatim>
 
@@ -63,8 +63,8 @@ Tar is structured as follows
 
 <verbatim>
 
-mvn clean assembly:assembly -DskipTests -DskipCheck=true -P distributed -Dhadoop.profile=1 [For hadoop 1]
-mvn clean assembly:assembly -DskipTests -DskipCheck=true -P distributed -Dhadoop.profile=2 [For hadoop 2]
+mvn clean assembly:assembly -DskipTests -DskipCheck=true -P distributed,hadoop-1 [For hadoop 1]
+mvn clean assembly:assembly -DskipTests -DskipCheck=true -P distributed,hadoop-2 [For hadoop 2]
 
 </verbatim>
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/feed/pom.xml
----------------------------------------------------------------------
diff --git a/feed/pom.xml b/feed/pom.xml
index 17f7055..03fa402 100644
--- a/feed/pom.xml
+++ b/feed/pom.xml
@@ -32,6 +32,48 @@
     <name>Apache Falcon Feed</name>
     <packaging>jar</packaging>
 
+    <profiles>
+        <profile>
+            <id>hadoop-1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-test</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>hadoop-2</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
+                 <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-common</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.falcon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/hadoop-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-dependencies/pom.xml b/hadoop-dependencies/pom.xml
index f53dbb6..225b9d9 100644
--- a/hadoop-dependencies/pom.xml
+++ b/hadoop-dependencies/pom.xml
@@ -35,10 +35,6 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -50,12 +46,6 @@
 
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/hadoop-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-webapp/pom.xml b/hadoop-webapp/pom.xml
index d1d3f9c..dcbbc5b 100644
--- a/hadoop-webapp/pom.xml
+++ b/hadoop-webapp/pom.xml
@@ -36,47 +36,43 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-core</artifactId>
+                    <scope>compile</scope>
                 </dependency>
             </dependencies>
         </profile>
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-client</artifactId>
                 </dependency>
-                
+
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-hdfs</artifactId>
                     <classifier>tests</classifier>
                 </dependency>
-                
+
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-hdfs</artifactId>
+                </dependency>
+
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
                 </dependency>
-                
+
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-yarn-server-nodemanager</artifactId>
-                </dependency>                    
+                </dependency>
             </dependencies>
         </profile>
     </profiles>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
----------------------------------------------------------------------
diff --git a/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java b/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
index 61fde29..c2bb6f7 100644
--- a/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
+++ b/hadoop-webapp/src/main/java/org/apache/falcon/listener/HadoopStartupListener.java
@@ -49,13 +49,11 @@ public class HadoopStartupListener implements ServletContextListener {
 
             NameNode.format(conf);
             final String[] emptyArgs = {};
-            String hadoopProfle = System.getProperty("hadoop.profile", "1");
-            if (hadoopProfle.equals("1")) {
-                startHadoop1Services(conf, emptyArgs);
-            } else if (hadoopProfle.equals("2")) {
+            try {
+                Class.forName("org.apache.hadoop.mapreduce.task.JobContextImpl");
                 startHadoop2Services(conf, emptyArgs);
-            } else {
-                throw new RuntimeException("Unhandled hadoop profile " + hadoopProfle);
+            } catch (ClassNotFoundException cnfe) {
+                startHadoop1Services(conf, emptyArgs);
             }
 
             startBroker();

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/messaging/pom.xml b/messaging/pom.xml
index 3aa6fc3..a59c1e3 100644
--- a/messaging/pom.xml
+++ b/messaging/pom.xml
@@ -36,10 +36,6 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -55,17 +51,29 @@
         </profile>
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
                  <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-client</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
+                 <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-common</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
             </dependencies>
         </profile>
     </profiles>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/oozie-el-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/oozie-el-extensions/pom.xml b/oozie-el-extensions/pom.xml
index 50aecc8..4c76c89 100644
--- a/oozie-el-extensions/pom.xml
+++ b/oozie-el-extensions/pom.xml
@@ -36,10 +36,6 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -50,12 +46,6 @@
         </profile>
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/oozie/pom.xml
----------------------------------------------------------------------
diff --git a/oozie/pom.xml b/oozie/pom.xml
index cf3ef07..a6514e4 100644
--- a/oozie/pom.xml
+++ b/oozie/pom.xml
@@ -36,10 +36,6 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -50,12 +46,6 @@
         </profile>
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aa805cf..49284a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,8 +96,6 @@
 
         <include.prism>true</include.prism>
 
-        <hadoop.profile>1</hadoop.profile>
-        <hadoop.version>1.1.2</hadoop.version>
         <slf4j.version>1.6.1</slf4j.version>
         <oozie.version>4.0.0</oozie.version>
         <oozie.buildversion>${oozie.version}-falcon</oozie.buildversion>
@@ -113,19 +111,138 @@
 
     <profiles>
         <profile>
-            <id>hadoop-2</id>
+            <id>hadoop-1</id>
             <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
+                <activeByDefault>true</activeByDefault>
             </activation>
+
+            <properties>
+                <hadoop.version>1.1.2</hadoop.version>
+            </properties>
+
+           <dependencyManagement>
+                <dependencies>
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-core</artifactId>
+		                <version>${hadoop.version}</version>
+                        <scope>provided</scope>
+		                <exclusions>
+		                    <exclusion>
+		                        <groupId>org.eclipse.jdt</groupId>
+		                        <artifactId>core</artifactId>
+		                    </exclusion>
+		                    <exclusion>
+		                        <groupId>tomcat</groupId>
+		                        <artifactId>jasper-runtime</artifactId>
+		                    </exclusion>
+		                    <exclusion>
+		                        <groupId>tomcat</groupId>
+		                        <artifactId>jasper-compiler</artifactId>
+		                    </exclusion>
+		                </exclusions>
+		            </dependency>
+
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-test</artifactId>
+		                <version>${hadoop.version}</version>
+                        <scope>test</scope>
+		                <exclusions>
+		                    <exclusion>
+		                        <groupId>org.slf4j</groupId>
+		                        <artifactId>slf4j-api</artifactId>
+		                    </exclusion>
+		                    <exclusion>
+		                        <groupId>org.apache.ftpserver</groupId>
+		                        <artifactId>ftpserver-core</artifactId>
+		                    </exclusion>
+		                    <exclusion>
+		                        <groupId>org.apache.ftpserver</groupId>
+		                        <artifactId>ftpserver-deprecated</artifactId>
+		                    </exclusion>
+		                </exclusions>
+		            </dependency>
+
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-client</artifactId>
+		                <version>${hadoop1.version}</version>
+		                <exclusions>
+		                    <exclusion>
+		                        <groupId>org.glassfish</groupId>
+		                        <artifactId>javax.servlet</artifactId>
+		                    </exclusion>
+		                </exclusions>
+		            </dependency>
+                </dependencies>
+          </dependencyManagement>
+        </profile>
+
+        <profile>
+            <id>hadoop-2</id>
             <properties>
-                <hadoop.profile>2</hadoop.profile>
                 <hadoop.version>2.0.2-alpha</hadoop.version>
             </properties>
+            <dependencyManagement>
+                <dependencies>
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-client</artifactId>
+		                <version>${hadoop.version}</version>
+		                <exclusions>
+		                    <exclusion>
+		                        <groupId>org.glassfish</groupId>
+		                        <artifactId>javax.servlet</artifactId>
+		                    </exclusion>
+		                </exclusions>
+		            </dependency>
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-hdfs</artifactId>
+		                <version>${hadoop.version}</version>
+		            </dependency>
+
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-common</artifactId>
+		                <version>${hadoop.version}</version>
+		            </dependency>
+
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-hdfs</artifactId>
+		                <version>${hadoop.version}</version>
+		                <classifier>tests</classifier>
+		            </dependency>
+
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-common</artifactId>
+		                <version>${hadoop.version}</version>
+		                <classifier>tests</classifier>
+		            </dependency>
+
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+		                <version>${hadoop.version}</version>
+		            </dependency>
+
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+		                <version>${hadoop.version}</version>
+		            </dependency>
+		            <dependency>
+		                <groupId>org.apache.hadoop</groupId>
+		                <artifactId>hadoop-auth</artifactId>
+		                <version>${hadoop.version}</version>
+		            </dependency>
+                </dependencies>
+          </dependencyManagement>
         </profile>
-        
+
         <profile>
             <id>distributed</id>
             <build>
@@ -233,84 +350,6 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-core</artifactId>
-                <version>${hadoop.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.eclipse.jdt</groupId>
-                        <artifactId>core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>tomcat</groupId>
-                        <artifactId>jasper-runtime</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>tomcat</groupId>
-                        <artifactId>jasper-compiler</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-test</artifactId>
-                <version>${hadoop.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.ftpserver</groupId>
-                        <artifactId>ftpserver-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.ftpserver</groupId>
-                        <artifactId>ftpserver-deprecated</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-client</artifactId>
-                <version>${hadoop.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.glassfish</groupId>
-                        <artifactId>javax.servlet</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-hdfs</artifactId>
-                <version>${hadoop.version}</version>
-                <classifier>tests</classifier>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-common</artifactId>
-                <version>${hadoop.version}</version>
-                <classifier>tests</classifier>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.apache.hadoop</groupId>
-                <artifactId>hadoop-yarn-server-nodemanager</artifactId>
-                <version>${hadoop.version}</version>
-            </dependency>
-                                        
-            <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
                 <version>${slf4j.version}</version>
@@ -591,14 +630,6 @@
                         <artifactId>slf4j-log4j12</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet.jsp</groupId>
-                        <artifactId>jsp-api</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>org.mortbay.jetty</groupId>
                         <artifactId>jetty</artifactId>
                     </exclusion>
@@ -733,6 +764,12 @@
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-common</artifactId>
                 <version>${hive.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.hadoop</groupId>
+                        <artifactId>hadoop-client</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!--  this is needed for embedded oozie -->
@@ -740,6 +777,20 @@
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-exec</artifactId>
                 <version>${hive.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.hbase</groupId>
+                        <artifactId>hbase-server</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.hbase</groupId>
+                        <artifactId>hbase-common</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.hbase</groupId>
+                        <artifactId>hbase-client</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/prism/pom.xml
----------------------------------------------------------------------
diff --git a/prism/pom.xml b/prism/pom.xml
index ffda9a8..3724fa7 100644
--- a/prism/pom.xml
+++ b/prism/pom.xml
@@ -25,12 +25,40 @@
         <groupId>org.apache.falcon</groupId>
         <artifactId>falcon-main</artifactId>
         <version>0.5-incubating-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>falcon-prism</artifactId>
     <description>Apache Falcon Prism</description>
     <name>Apache Falcon Prism</name>
     <packaging>war</packaging>
 
+    <profiles>
+        <profile>
+            <id>hadoop-1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>hadoop-2</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-client</artifactId>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.falcon</groupId>
@@ -178,41 +206,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>hadoop-1</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-core</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-client</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/process/pom.xml
----------------------------------------------------------------------
diff --git a/process/pom.xml b/process/pom.xml
index 912c8c0..0ca554a 100644
--- a/process/pom.xml
+++ b/process/pom.xml
@@ -36,27 +36,39 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-core</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-test</artifactId>
+                </dependency>
             </dependencies>
         </profile>
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
+                 <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-common</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
             </dependencies>
         </profile>
     </profiles>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/replication/pom.xml
----------------------------------------------------------------------
diff --git a/replication/pom.xml b/replication/pom.xml
index da3ed0d..95cbc97 100644
--- a/replication/pom.xml
+++ b/replication/pom.xml
@@ -36,10 +36,6 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -51,12 +47,6 @@
     
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
                  <dependency>
                     <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/rerun/pom.xml
----------------------------------------------------------------------
diff --git a/rerun/pom.xml b/rerun/pom.xml
index 9e2632b..70bb5f2 100644
--- a/rerun/pom.xml
+++ b/rerun/pom.xml
@@ -37,10 +37,6 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -52,12 +48,6 @@
 
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/retention/pom.xml
----------------------------------------------------------------------
diff --git a/retention/pom.xml b/retention/pom.xml
index ec3470f..9121c41 100644
--- a/retention/pom.xml
+++ b/retention/pom.xml
@@ -32,6 +32,48 @@
     <name>Apache Falcon Retention</name>
     <packaging>jar</packaging>
 
+    <profiles>
+        <profile>
+            <id>hadoop-1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-test</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>hadoop-2</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                </dependency>
+                <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-hdfs</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
+                 <dependency>
+                       <groupId>org.apache.hadoop</groupId>
+                       <artifactId>hadoop-common</artifactId>
+                       <classifier>tests</classifier>
+                 </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.falcon</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/test-util/pom.xml
----------------------------------------------------------------------
diff --git a/test-util/pom.xml b/test-util/pom.xml
index c00730b..6bd4129 100644
--- a/test-util/pom.xml
+++ b/test-util/pom.xml
@@ -36,10 +36,6 @@
             <id>hadoop-1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -49,35 +45,40 @@
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-test</artifactId>
+                    <scope>compile</scope>
                 </dependency>
             </dependencies>
         </profile>
 
         <profile>
             <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
             <dependencies>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-client</artifactId>
                 </dependency>
-                
+
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-hdfs</artifactId>
                     <classifier>tests</classifier>
                 </dependency>
-                                
+
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-common</artifactId>
                     <classifier>tests</classifier>
-                </dependency>                
+                </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>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3c27e6b8/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index f3d52c1..0c2d844 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -31,6 +31,55 @@
     <name>Apache Falcon Web Application</name>
     <packaging>war</packaging>
 
+    <profiles>
+        <profile>
+            <id>distributed</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <version>2.4</version>
+                        <configuration>
+                            <packagingExcludes>WEB-INF/classes/deploy.properties</packagingExcludes>
+                            <webResources>
+                                <resource>
+                                    <directory>src/main/webapp/WEB-INF/distributed</directory>
+                                    <targetPath>WEB-INF</targetPath>
+                                </resource>
+                            </webResources>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>hadoop-1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>hadoop-2</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-client</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.falcon</groupId>
@@ -89,6 +138,12 @@
             <groupId>org.apache.falcon</groupId>
             <artifactId>falcon-test-util</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -395,63 +450,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>distributed</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <version>2.4</version>
-                        <configuration>
-                            <packagingExcludes>WEB-INF/classes/deploy.properties</packagingExcludes>
-                            <webResources>
-                              <resource>
-                                <directory>src/main/webapp/WEB-INF/distributed</directory>
-                                <targetPath>WEB-INF</targetPath>
-                              </resource>
-                            </webResources>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>hadoop-1</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>1</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-core</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <id>hadoop-2</id>
-            <activation>
-                <property>
-                    <name>hadoop.profile</name>
-                    <value>2</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-client</artifactId>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>


Mime
View raw message