Updated Branches: refs/heads/1.4 4808583ec -> c4ca79911
ACCUMULO-1166 More consolidation of pom in regards to hadoop versions. Project: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/commit/c4ca7991 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/tree/c4ca7991 Diff: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/diff/c4ca7991 Branch: refs/heads/1.4 Commit: c4ca799116c6af2d3cc76f1c2e8dd75c32fdbb24 Parents: 4808583 Author: Josh Elser <[email protected]> Authored: Tue Sep 17 16:32:56 2013 -0400 Committer: Josh Elser <[email protected]> Committed: Tue Sep 17 16:32:56 2013 -0400 ---------------------------------------------------------------------- src/main/resources/archetype-resources/pom.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/blob/c4ca7991/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index 928a542..d7ec0ad 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -27,7 +27,6 @@ <properties> <accumulo.version>1.4.4</accumulo.version> <hadoop-one.version>1.2.1</hadoop-one.version> - <hadoop-two.version>2.1.0-beta</hadoop-two.version> <maclass>${package}.MapReduceExample</maclass> </properties> @@ -44,13 +43,6 @@ <properties> <hadoop.version>${hadoop-one.version}</hadoop.version> </properties> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>${hadoop.version}</version> - </dependency> - </dependencies> </profile> <profile> <id>shell</id> @@ -118,7 +110,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> + <artifactId>hadoop-core</artifactId> <version>${hadoop.version}</version> </dependency> <dependency>
