falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [5/6] git commit: Merge commit 'f1db98b378a36b749206682b3bc3900e0cad7716' into 85
Date Mon, 23 Sep 2013 22:55:47 GMT
Merge commit 'f1db98b378a36b749206682b3bc3900e0cad7716' into 85

Conflicts:
	hadoop-webapp/pom.xml
	pom.xml


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

Branch: refs/heads/FALCON-85
Commit: a298d857d393676a2f768130ce9fee6582c5ff91
Parents: 72d1857 f1db98b
Author: Venkatesh Seetharam <venkatesh@apache.org>
Authored: Mon Sep 23 15:13:43 2013 -0700
Committer: Venkatesh Seetharam <venkatesh@apache.org>
Committed: Mon Sep 23 15:13:43 2013 -0700

----------------------------------------------------------------------
 hadoop-webapp/pom.xml | 20 --------------------
 pom.xml               |  3 ---
 2 files changed, 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/a298d857/hadoop-webapp/pom.xml
----------------------------------------------------------------------
diff --cc hadoop-webapp/pom.xml
index 96a6043,312a71b..21540d0
--- a/hadoop-webapp/pom.xml
+++ b/hadoop-webapp/pom.xml
@@@ -91,58 -91,6 +91,38 @@@
              <groupId>org.apache.activemq</groupId>
              <artifactId>activemq-core</artifactId>
          </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.hive</groupId>
 +            <artifactId>hive-metastore</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.hcatalog</groupId>
 +            <artifactId>webhcat</artifactId>
 +        </dependency>
 +
 +        <!-- Hive Metastore and WebHcat fails with out these dependencies -->
 +        <dependency>
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>slf4j-api</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.slf4j</groupId>
 +            <artifactId>slf4j-log4j12</artifactId>
 +        </dependency>
-         <dependency>
-             <groupId>org.apache.hive</groupId>
-             <artifactId>hive-metastore</artifactId>
-         </dependency>
- 
-         <dependency>
-             <groupId>org.apache.hcatalog</groupId>
-             <artifactId>webhcat</artifactId>
-         </dependency>
 +
 +        <!-- Oozie dependencies -->
 +        <dependency>
 +            <groupId>org.apache.hive</groupId>
 +            <artifactId>hive-exec</artifactId>
 +        </dependency>
 +
 +        <dependency>
 +            <groupId>org.apache.hcatalog</groupId>
 +            <artifactId>webhcat-java-client</artifactId>
 +        </dependency>
- 
-         <!-- Hive Metastore and WebHcat fails with out these dependencies -->
-         <dependency>
-             <groupId>org.slf4j</groupId>
-             <artifactId>slf4j-api</artifactId>
-         </dependency>
- 
-         <dependency>
-             <groupId>org.slf4j</groupId>
-             <artifactId>slf4j-log4j12</artifactId>
-         </dependency>
      </dependencies>
  
      <build>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/a298d857/pom.xml
----------------------------------------------------------------------


Mime
View raw message