ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated that didn't exist in prior version. ACCUMULO-975 Fix proxy pom.xml to support Hadoop 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1435230 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit ec4055c698d7735093e964e30729ede9df71157f) Reason: Hadoop2 compat Author: Christopher Tubbs <ctubb...@apache.org> Ref: ACCUMULO-1792 This patch differs from upstream by only including the changes relevant to ACCUMULO-975. It also does not reformat as much of proxy/pom.xml as the original. 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/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c16d8b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c16d8b8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4c16d8b8 Branch: refs/heads/1.4.5-SNAPSHOT Commit: 4c16d8b82713cb888e33a224a57d0d41b156b50b Parents: 0f97284 Author: Sean Busbey <bus...@cloudera.com> Authored: Mon Nov 4 15:39:14 2013 -0600 Committer: Eric Newton <eric.new...@gmail.com> Committed: Mon Nov 25 16:06:42 2013 -0500 ---------------------------------------------------------------------- src/proxy/pom.xml | 96 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4c16d8b8/src/proxy/pom.xml ---------------------------------------------------------------------- diff --git a/src/proxy/pom.xml b/src/proxy/pom.xml index 5d0414d..e1daa29 100644 --- a/src/proxy/pom.xml +++ b/src/proxy/pom.xml @@ -33,22 +33,22 @@ <build> <pluginManagement> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestSections> - <manifestSection> - <name>accumulo/proxy/</name> - <manifestEntries> - <Sealed>true</Sealed> - </manifestEntries> - </manifestSection> - </manifestSections> - </archive> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestSections> + <manifestSection> + <name>accumulo/proxy/</name> + <manifestEntries> + <Sealed>true</Sealed> + </manifestEntries> + </manifestSection> + </manifestSections> + </archive> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -72,9 +72,9 @@ </build> <dependencies> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-core</artifactId> - <scope>compile</scope> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.accumulo</groupId> @@ -82,11 +82,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <scope>compile</scope> @@ -113,16 +108,55 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>examples-simple</artifactId> - <version>${project.version}</version> - <scope>test</scope> + <groupId>org.apache.accumulo</groupId> + <artifactId>examples-simple</artifactId> + <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-server</artifactId> - <version>${project.version}</version> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-server</artifactId> + <version>${project.version}</version> </dependency> </dependencies> + <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> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> </project>
