commit e6ceda913cafbdf24021239f0d0379aceebf1f65
author Christopher Tubbs <ctubbsii@apache.org> Tue Oct 11 18:54:57 2016 -0400
committer Christopher Tubbs <ctubbsii@apache.org> Tue Oct 11 18:54:57 2016 -0400
tree d7b1d2eb9870c63580153074b2f224224836263d
parent ffad6d1a301a85f234e085c5af83a48dcf72db3c
parent ef4d6f50eb2fa044a231146f129313afe390c376

Merge branch '1.8'

pom.xml

diff --git a/pom.xml b/pom.xml
index 40e0349..0c9760e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo-project</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>accumulo-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>

src/it/plugin-test/pom.xml

diff --git a/src/it/plugin-test/pom.xml b/src/it/plugin-test/pom.xml
index 93fad9b..07a38e4 100644
--- a/src/it/plugin-test/pom.xml
+++ b/src/it/plugin-test/pom.xml
@@ -36,10 +36,6 @@
       <artifactId>commons-cli</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>