Updated Branches: refs/heads/flume-1.3.0 d1a7dbdd1 -> 9e0396372
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/9e039637 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/9e039637 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/9e039637 Branch: refs/heads/flume-1.3.0 Commit: 9e039637220cf12d8a0b73cd22128cea25397a16 Parents: d1a7dbd Author: Hari Shreedharan <[email protected]> Authored: Wed Oct 17 11:39:01 2012 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Wed Oct 17 11:40:49 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/9e039637/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 45b5e1e..0faf92d 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>
