flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hshreedha...@apache.org
Subject git commit: FLUME-1650. Fix flume-ng-hbase-sink compilation against Hadoop 2.X.
Date Wed, 17 Oct 2012 18:42:18 GMT
Updated Branches:
  refs/heads/flume-1.4 ee595f6c4 -> 84c4586bd


FLUME-1650. Fix flume-ng-hbase-sink compilation against Hadoop 2.X.

(Roman Shaposhnik via Hari Shreedharan)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/84c4586b
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/84c4586b
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/84c4586b

Branch: refs/heads/flume-1.4
Commit: 84c4586bda367b44e041a4b7c6a3d4843b39106d
Parents: ee595f6
Author: Hari Shreedharan <hshreedharan@apache.org>
Authored: Wed Oct 17 11:39:01 2012 -0700
Committer: Hari Shreedharan <hshreedharan@apache.org>
Committed: Wed Oct 17 11:41:30 2012 -0700

----------------------------------------------------------------------
 flume-ng-sinks/flume-ng-hbase-sink/pom.xml |   47 ++++++++++++++++++++---
 1 files changed, 41 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/84c4586b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
index 25f3be7..9651350 100644
--- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
@@ -91,12 +91,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
@@ -110,4 +104,45 @@
 
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>hadoop-1.0</id>
+      <activation>
+        <property>
+          <name>!hadoop.profile</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-test</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <!-- required because the hadoop-core pom is missing these deps
+            and MiniDFSCluster pulls in the webhdfs classes -->
+        <dependency>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-core</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>hadoop-0.23</id>
+      <activation>
+        <property>
+          <name>hadoop.profile</name>
+          <value>23</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-minicluster</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
 </project>


Mime
View raw message