ACCUMULO-876 added maven profiles to assist in compiling against different versions of hadoop
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1419924 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 65c271c2a46b87eb0e4991d7fd7b6fbd7456c0a8) Reason: Hadoop2 Compat Author: Billie Rinaldi <bil...@apache.org> Ref: ACCUMULO-1792 This patch differs from upstream by fixing poms not in the accumulo 1.5 release and keeping the 1.4 specific build instructions in the README. Author: Jonathan Hsieh <j...@cloudera.com> Author: Sean Busbey <bus...@cloudera.com> Signed-off-by: Eric Newton <eric.new...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/f0b42c77 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/f0b42c77 Diff: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/diff/f0b42c77 Branch: refs/heads/1.4.5-SNAPSHOT Commit: f0b42c779f8c8fdedbc8b5eee04bbe69679d7f60 Parents: 5cd987d Author: Billie Rinaldi <bil...@apache.org> Authored: Tue Dec 11 00:01:39 2012 +0000 Committer: Eric Newton <eric.new...@gmail.com> Committed: Mon Nov 25 16:06:42 2013 -0500 ---------------------------------------------------------------------- ingest/pom.xml | 42 +++++++++++++++++++++++++++++++++++++----- query/pom.xml | 43 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 75 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/f0b42c77/ingest/pom.xml ---------------------------------------------------------------------- diff --git a/ingest/pom.xml b/ingest/pom.xml index 29b2047..31d7110 100644 --- a/ingest/pom.xml +++ b/ingest/pom.xml @@ -29,11 +29,7 @@ <dependencies> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> + <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> </dependency> <dependency> @@ -125,4 +121,40 @@ </plugins> </build> + <profiles> + <!-- profile for building against Hadoop 1.0.x + Activate by not specifying hadoop.profile --> + <profile> + <id>hadoop-1.0</id> + <activation> + <property> + <name>!hadoop.profile</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + </dependency> + </dependencies> + </profile> + <!-- profile for building against Hadoop 2.0.x + Activate using: mvn -Dhadoop.profile=2.0 --> + <profile> + <id>hadoop-2.0</id> + <activation> + <property> + <name>hadoop.profile</name> + <value>2.0</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + </project> http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/f0b42c77/query/pom.xml ---------------------------------------------------------------------- diff --git a/query/pom.xml b/query/pom.xml index 05b1e46..8c6e6d3 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -38,11 +38,7 @@ <artifactId>accumulo-core</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> + <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <scope>runtime</scope> </dependency> @@ -144,4 +140,41 @@ </plugins> </build> <modelVersion>4.0.0</modelVersion> + + <profiles> + <!-- profile for building against Hadoop 1.0.x + Activate by not specifying hadoop.profile --> + <profile> + <id>hadoop-1.0</id> + <activation> + <property> + <name>!hadoop.profile</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + </dependency> + </dependencies> + </profile> + <!-- profile for building against Hadoop 2.0.x + Activate using: mvn -Dhadoop.profile=2.0 --> + <profile> + <id>hadoop-2.0</id> + <activation> + <property> + <name>hadoop.profile</name> + <value>2.0</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + </project>
