accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject git commit: ACCUMULO-1166 Realized that 1.4 doesn't actually have hadoop-2 support (in looking at the 1.4.4 Accumulo pom and verified that the mapreduce example doesn't actually run).
Date Tue, 17 Sep 2013 19:48:45 GMT
Updated Branches:
  refs/heads/1.4 bc4678b93 -> 4808583ec


ACCUMULO-1166 Realized that 1.4 doesn't actually have hadoop-2 support
(in looking at the 1.4.4 Accumulo pom and verified that the mapreduce
 example doesn't actually run).


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/4808583e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/tree/4808583e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/diff/4808583e

Branch: refs/heads/1.4
Commit: 4808583ec6edf42760d7c7e7db8f2885b02bbfaa
Parents: bc4678b
Author: Josh Elser <elserj@rpi.edu>
Authored: Tue Sep 17 15:43:38 2013 -0400
Committer: Josh Elser <elserj@rpi.edu>
Committed: Tue Sep 17 15:43:38 2013 -0400

----------------------------------------------------------------------
 src/main/resources/archetype-resources/pom.xml | 30 +++++----------------
 1 file changed, 7 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/blob/4808583e/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 0a1fd93..928a542 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -27,12 +27,12 @@
   <properties>
     <accumulo.version>1.4.4</accumulo.version>
     <hadoop-one.version>1.2.1</hadoop-one.version>
-    <hadoop-two.version>2.0.2-alpha</hadoop-two.version>
+    <hadoop-two.version>2.1.0-beta</hadoop-two.version>
     <maclass>${package}.MapReduceExample</maclass>
   </properties>
 
   <profiles>
-    <!-- profile for building against Hadoop 1.0.x
+	<!-- profile for building against Hadoop 1.2.x
     Activate by not specifying hadoop.profile -->
     <profile>
       <id>hadoop-1.0</id>
@@ -52,27 +52,6 @@
         </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>
-      <properties>
-        <hadoop.version>${hadoop-two.version}</hadoop.version>
-      </properties>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-client</artifactId>
-          <version>${hadoop.version}</version>
-        </dependency>
-      </dependencies>
-    </profile>
     <profile>
       <id>shell</id>
       <build>
@@ -138,6 +117,11 @@
       <version>${accumulo.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
       <version>3.3.6</version>


Mime
View raw message