You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by br...@apache.org on 2012/10/30 23:59:40 UTC
[18/24] git commit: FLUME-1650. Fix flume-ng-hbase-sink compilation
against Hadoop 2.X.
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/ab984d24
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/ab984d24
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/ab984d24
Branch: refs/heads/FLUME-1502
Commit: ab984d24babf80d502ee317c6337dc8b3d7d4163
Parents: 9b30360
Author: Hari Shreedharan <hs...@apache.org>
Authored: Wed Oct 17 11:39:01 2012 -0700
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Wed Oct 17 11:39:01 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/ab984d24/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>