commit d0a00df67172ee78d24e00e855afbb1e98bd5c0b
author Christopher Tubbs <ctubbsii@apache.org> Wed Apr 18 17:33:25 2018 -0400
committer Christopher Tubbs <ctubbsii@apache.org> Wed Apr 18 17:33:25 2018 -0400
tree 411b0a8759708e08b4b5193e8d7b89cd8b17952f
parent e88385a3ea854622d6baff48dab44419a0a0ce58
parent d6cbbcd8b03bc08262a652c0fc9a78976ff63dd0

Merge branch '1.9'

pom.xml

diff --git a/pom.xml b/pom.xml
index 32c342a..628813a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo-project</artifactId>
-    <version>1.9.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>accumulo-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
@@ -78,6 +78,23 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>analyze</id>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+            <configuration>
+              <ignoredUnusedDeclaredDependencies combine.children="append">
+                <unusedDeclaredDependency>junit:junit:jar:4.12</unusedDeclaredDependency>
+              </ignoredUnusedDeclaredDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
         <configuration>
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>

src/it/plugin-test/pom.xml

diff --git a/src/it/plugin-test/pom.xml b/src/it/plugin-test/pom.xml
index 9f16afa..e77cf28 100644
--- a/src/it/plugin-test/pom.xml
+++ b/src/it/plugin-test/pom.xml
@@ -40,10 +40,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>
@@ -52,10 +48,6 @@
       <artifactId>commons-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
@@ -76,6 +68,10 @@
       <artifactId>accumulo-minicluster</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
     </dependency>