commit e0c0b241f966e2116c1d941041b01807201fbea8
author Josh Elser <josh.elser@gmail.com> Tue Sep 17 20:48:00 2013 -0400
committer Josh Elser <josh.elser@gmail.com> Tue Sep 17 20:48:00 2013 -0400
tree 838a9ca778d1879d8984ed96eff249491e48b773
parent 07f705921c2fa81543e920ef51a51dc7d2e3bfb6
parent 0c77dae9020a798eabd3748ce44685be4fc3ebfd

ACCUMULO-1166 Merge branch '1.5'

pom.xml

diff --git a/pom.xml b/pom.xml
index 7115c3c..a2f3706 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.apache.accumulo</groupId>
   <artifactId>instamo-archetype</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
   <name>instamo-archetype</name>
   <scm>

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 60779f5..91e3bf0 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -25,7 +25,7 @@
   <url>http://accumulo.apache.org</url>
 
   <properties>
-    <accumulo.version>1.5.0</accumulo.version>
+    <accumulo.version>1.6.0-SNAPSHOT</accumulo.version>
     <hadoop-one.version>1.2.1</hadoop-one.version>
     <hadoop-two.version>2.1.0-beta</hadoop-two.version>
     <slf4j.version>1.6.1</slf4j.version>
@@ -198,6 +198,11 @@
       <version>1.2</version>
     </dependency>
     <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.7</version>
+    </dependency>
+    <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>${httpclient.version}</version>