falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [2/5] git commit: FALCON-759 Adding cluster entity fails when Yarn TimelineClient is enabled. Contributed by Balu Vellanki
Date Thu, 02 Oct 2014 00:51:54 GMT
FALCON-759 Adding cluster entity fails when Yarn TimelineClient is enabled. Contributed by
Balu Vellanki


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

Branch: refs/heads/master
Commit: 1a81d09f872bfbcebcdcb93f7143536cf56de2ce
Parents: 969fbe8
Author: Venkatesh Seetharam <venkatesh@apache.org>
Authored: Wed Oct 1 13:59:23 2014 -0700
Committer: Venkatesh Seetharam <venkatesh@apache.org>
Committed: Wed Oct 1 17:41:21 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                 |  3 ++
 hadoop-dependencies/pom.xml | 61 +++++++++++++++++++++++++++++
 hadoop-webapp/pom.xml       | 43 ++++++++++++++++++++-
 pom.xml                     | 83 +++++++++++++++++++++++++++++++---------
 webapp/pom.xml              | 35 +++++++++--------
 5 files changed, 191 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a81d09f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8220219..a32944a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -101,6 +101,9 @@ Trunk (Unreleased)
   OPTIMIZATIONS
 
   BUG FIXES
+   FALCON-759 Adding cluster entity fails when Yarn TimelineClient is enabled
+   (Balu Vellanki via Venkatesh Seetharam)
+
    FALCON-740 Entity kill job calls OozieClient.kill on bundle coord job ids
    before calling kill on bundle job id (Sowmya Ramesh via Venkatesh Seetharam)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a81d09f/hadoop-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-dependencies/pom.xml b/hadoop-dependencies/pom.xml
index 4d1c8d5..2ebc20f 100644
--- a/hadoop-dependencies/pom.xml
+++ b/hadoop-dependencies/pom.xml
@@ -50,6 +50,67 @@
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-client</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-hdfs</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-auth</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-mapreduce-client-common</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-client</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-server</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-json</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-core</artifactId>
+                    <scope>compile</scope>
                 </dependency>
             </dependencies>
             <build>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a81d09f/hadoop-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-webapp/pom.xml b/hadoop-webapp/pom.xml
index 5e92cb5..7712afa 100644
--- a/hadoop-webapp/pom.xml
+++ b/hadoop-webapp/pom.xml
@@ -74,6 +74,7 @@
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-client</artifactId>
+                    <scope>compile</scope>
                 </dependency>
 
                 <dependency>
@@ -85,21 +86,61 @@
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-hdfs</artifactId>
+                    <scope>compile</scope>
                 </dependency>
 
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
-                    <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+                    <artifactId>hadoop-common</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-auth</artifactId>
+                    <scope>compile</scope>
                 </dependency>
 
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-mapreduce-client-common</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+                    <scope>compile</scope>
                 </dependency>
 
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-client</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-server</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-json</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-core</artifactId>
+                    <scope>compile</scope>
                 </dependency>
             </dependencies>
         </profile>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a81d09f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 81be15b..effab13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,6 +221,7 @@
 		                <groupId>org.apache.hadoop</groupId>
 		                <artifactId>hadoop-client</artifactId>
 		                <version>${hadoop.version}</version>
+                        <scope>provided</scope>
 		                <exclusions>
                             <exclusion>
                                 <groupId>com.sun.jersey</groupId>
@@ -234,61 +235,97 @@
                                 <groupId>com.sun.jersey</groupId>
                                 <artifactId>jersey-json</artifactId>
                             </exclusion>
-		                    <exclusion>
-		                        <groupId>org.glassfish</groupId>
-		                        <artifactId>javax.servlet</artifactId>
-		                    </exclusion>
+                            <exclusion>
+                                <groupId>org.glassfish</groupId>
+                                <artifactId>javax.servlet</artifactId>
+                            </exclusion>
+                            <exclusion>
+                                <groupId>org.apache.hadoop</groupId>
+                                <artifactId>hadoop-annotations</artifactId>
+                            </exclusion>
 		                </exclusions>
 		            </dependency>
 		            <dependency>
 		                <groupId>org.apache.hadoop</groupId>
 		                <artifactId>hadoop-hdfs</artifactId>
 		                <version>${hadoop.version}</version>
-		            </dependency>
+                        <scope>provided</scope>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>org.apache.hadoop</groupId>
+                                <artifactId>hadoop-annotations</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
 
 		            <dependency>
 		                <groupId>org.apache.hadoop</groupId>
 		                <artifactId>hadoop-common</artifactId>
 		                <version>${hadoop.version}</version>
-		            </dependency>
+                        <scope>provided</scope>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>org.apache.hadoop</groupId>
+                                <artifactId>hadoop-annotations</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
 
 		            <dependency>
 		                <groupId>org.apache.hadoop</groupId>
 		                <artifactId>hadoop-mapreduce-client-common</artifactId>
 		                <version>${hadoop.version}</version>
-		            </dependency>
+                        <scope>provided</scope>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>org.apache.hadoop</groupId>
+                                <artifactId>hadoop-annotations</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
 
 		            <dependency>
 		                <groupId>org.apache.hadoop</groupId>
 		                <artifactId>hadoop-hdfs</artifactId>
 		                <version>${hadoop.version}</version>
 		                <classifier>tests</classifier>
-		            </dependency>
+                        <scope>test</scope>
+                    </dependency>
 
 		            <dependency>
 		                <groupId>org.apache.hadoop</groupId>
 		                <artifactId>hadoop-common</artifactId>
 		                <version>${hadoop.version}</version>
 		                <classifier>tests</classifier>
-		            </dependency>
+                        <scope>test</scope>
+                    </dependency>
 
 		            <dependency>
 		                <groupId>org.apache.hadoop</groupId>
 		                <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
 		                <version>${hadoop.version}</version>
-		            </dependency>
+                        <scope>provided</scope>
+                    </dependency>
 
 		            <dependency>
 		                <groupId>org.apache.hadoop</groupId>
 		                <artifactId>hadoop-yarn-server-nodemanager</artifactId>
 		                <version>${hadoop.version}</version>
-		            </dependency>
+                        <scope>provided</scope>
+                    </dependency>
 
 		            <dependency>
 		                <groupId>org.apache.hadoop</groupId>
 		                <artifactId>hadoop-auth</artifactId>
 		                <version>${hadoop.version}</version>
-		            </dependency>
+                        <scope>provided</scope>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>org.apache.hadoop</groupId>
+                                <artifactId>hadoop-annotations</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
                 </dependencies>
           </dependencyManagement>
         </profile>
@@ -585,12 +622,28 @@
                 <groupId>com.sun.jersey</groupId>
                 <artifactId>jersey-client</artifactId>
                 <version>${jersey.version}</version>
+                <scope>provided</scope>
             </dependency>
 
             <dependency>
                 <groupId>com.sun.jersey</groupId>
                 <artifactId>jersey-json</artifactId>
                 <version>${jersey.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-server</artifactId>
+                <version>${jersey.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-core</artifactId>
+                <version>${jersey.version}</version>
+                <scope>provided</scope>
             </dependency>
 
             <dependency>
@@ -662,12 +715,6 @@
             </dependency>
 
             <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>javax.jms</groupId>
                 <artifactId>jms</artifactId>
                 <version>1.1</version>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1a81d09f/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 9ba1a12..d96f7e3 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -141,38 +141,43 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-plus</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-server</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-plus</artifactId>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-json</artifactId>
         </dependency>
 
         <dependency>
@@ -394,7 +399,7 @@
                 <artifactId>maven-jetty-plugin</artifactId>
                 <version>${jetty.version}</version>
                 <configuration>
-                    <skip>${skipTests}</skip>
+                    <skip>${skipITs}</skip> <!--only skip int tests-->
                     <connectors>
                         <connector implementation="org.mortbay.jetty.security.SslSocketConnector">
                             <port>41443</port>


Mime
View raw message