You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2017/04/04 20:57:17 UTC
[1/2] accumulo git commit: ACCUMULO-4618 Enforce dependency analysis
during build
Repository: accumulo
Updated Branches:
refs/heads/master 34532dcc6 -> 82860ca44
ACCUMULO-4618 Enforce dependency analysis during build
* Build will fail if module has missing or unused dependency
* Plugin is configured to ignore certain dependencies in main pom.xml
* Fixed all missing or unused dependencies in build
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cb150189
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cb150189
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cb150189
Branch: refs/heads/master
Commit: cb1501896f9ba0d579c14dc264067d7622670dcd
Parents: 6e34217
Author: Mike Walch <mw...@apache.org>
Authored: Tue Apr 4 13:11:41 2017 -0400
Committer: Mike Walch <mw...@apache.org>
Committed: Tue Apr 4 16:49:26 2017 -0400
----------------------------------------------------------------------
core/pom.xml | 18 +++++++-------
fate/pom.xml | 4 ---
iterator-test-harness/pom.xml | 8 +++---
maven-plugin/pom.xml | 5 ++--
minicluster/pom.xml | 16 ++++++++++++
pom.xml | 51 +++++++++++++++++++++++++++++++++++---
proxy/pom.xml | 12 ++++++---
server/base/pom.xml | 10 +++++---
server/gc/pom.xml | 17 ++++++++-----
server/master/pom.xml | 21 ++++++++++------
server/monitor/pom.xml | 24 ++++++++----------
server/tracer/pom.xml | 12 +++++++--
server/tserver/pom.xml | 21 ++++++++--------
shell/pom.xml | 18 ++++++++++----
start/pom.xml | 29 +++++-----------------
test/pom.xml | 30 ++++++++++++++--------
16 files changed, 187 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 80a328f..aec7f66 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -44,6 +44,10 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
@@ -84,10 +88,6 @@
<artifactId>commons-math3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs2</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
@@ -108,11 +108,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -128,6 +123,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/fate/pom.xml
----------------------------------------------------------------------
diff --git a/fate/pom.xml b/fate/pom.xml
index bc665dc..94b81e1 100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@ -35,10 +35,6 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/iterator-test-harness/pom.xml
----------------------------------------------------------------------
diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml
index 3a9c6f6..0ba6d4c 100644
--- a/iterator-test-harness/pom.xml
+++ b/iterator-test-harness/pom.xml
@@ -26,16 +26,16 @@
<name>Apache Accumulo Iterator Test Harness</name>
<description>A library for testing Apache Accumulo Iterators.</description>
<dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<!--TODO Don't force downstream users to have JUnit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 0c9760e..fa38dfc 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -66,9 +66,8 @@
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 84f81db..2ef3998 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -48,6 +48,10 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -57,6 +61,10 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-gc</artifactId>
</dependency>
<dependency>
@@ -97,10 +105,18 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8aacdb2..801a6e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,7 @@
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
<!-- bouncycastle version for test dependencies -->
<bouncycastle.version>1.54</bouncycastle.version>
+ <commons.httpclient.version>3.1</commons.httpclient.version>
<!-- Curator version -->
<curator.version>2.11.0</curator.version>
<!-- relative path for Eclipse format; should override in child modules if necessary -->
@@ -133,7 +134,7 @@
<forkCount>1</forkCount>
<hadoop.version>2.6.4</hadoop.version>
<htrace.version>3.1.0-incubating</htrace.version>
- <httpclient.version>3.1</httpclient.version>
+ <httpclient.version>4.3.1</httpclient.version>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
<!-- jetty 9.2 is the last version to support jdk less than 1.8 -->
<jetty.version>9.2.17.v20160517</jetty.version>
@@ -213,7 +214,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>${httpclient.version}</version>
+ <version>${commons.httpclient.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -422,7 +423,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.1</version>
+ <version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -515,6 +516,11 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
<version>${powermock.version}</version>
@@ -549,6 +555,11 @@
<artifactId>slf4j-nop</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
@@ -840,6 +851,40 @@
</pluginManagement>
<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>
+ <failOnWarning>true</failOnWarning>
+ <ignoredUsedUndeclaredDependencies>
+ <!-- used/undeclared child jars brought in by parents below -->
+ <usedUndeclaredDependency>org.apache.curator:curator-client:jar:${curator.version}</usedUndeclaredDependency>
+ <usedUndeclaredDependency>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</usedUndeclaredDependency>
+ <usedUndeclaredDependency>org.apache.hadoop:hadoop-hdfs:*:${hadoop.version}</usedUndeclaredDependency>
+ <usedUndeclaredDependency>org.apache.hadoop:hadoop-mapreduce-client-core:jar:${hadoop.version}</usedUndeclaredDependency>
+ <usedUndeclaredDependency>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</usedUndeclaredDependency>
+ <usedUndeclaredDependency>org.powermock:powermock-core:jar:${powermock.version}</usedUndeclaredDependency>
+ <usedUndeclaredDependency>org.powermock:powermock-reflect:jar:${powermock.version}</usedUndeclaredDependency>
+ <usedUndeclaredDependency>org.apache.httpcomponents:httpcore:jar:*</usedUndeclaredDependency>
+ </ignoredUsedUndeclaredDependencies>
+ <ignoredUnusedDeclaredDependencies>
+ <!-- unused/declared parent jars that bring in children. slf4j-log4j12 provides implementation -->
+ <unusedDeclaredDependency>org.apache.hadoop:hadoop-client:jar:${hadoop.version}</unusedDeclaredDependency>
+ <unusedDeclaredDependency>org.apache.hadoop:hadoop-minicluster:jar:${hadoop.version}</unusedDeclaredDependency>
+ <unusedDeclaredDependency>org.powermock:powermock-api-easymock:jar:${powermock.version}</unusedDeclaredDependency>
+ <unusedDeclaredDependency>org.slf4j:slf4j-log4j12:jar:${slf4j.version}</unusedDeclaredDependency>
+ <unusedDeclaredDependency>org.apache.httpcomponents:httpclient:jar:${httpclient.version}</unusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 253c5e8..2e441bb 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -40,12 +40,12 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -60,6 +60,10 @@
<artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/server/base/pom.xml
----------------------------------------------------------------------
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 0bb1efd..3554c14 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -105,9 +105,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -119,6 +118,11 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<testResources>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/server/gc/pom.xml
----------------------------------------------------------------------
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index 50cdfd0..2fc9154 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -41,8 +41,8 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -57,6 +57,10 @@
<artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
@@ -73,10 +77,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -86,5 +86,10 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/server/master/pom.xml
----------------------------------------------------------------------
diff --git a/server/master/pom.xml b/server/master/pom.xml
index 51775a8..6204672 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -41,12 +41,12 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -61,6 +61,10 @@
<artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</dependency>
@@ -81,10 +85,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -94,5 +94,10 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index f42a697..edaedff 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -41,6 +41,10 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
@@ -70,6 +74,10 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-tracer</artifactId>
</dependency>
<dependency>
@@ -105,23 +113,13 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <scope>runtime</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/server/tracer/pom.xml
----------------------------------------------------------------------
diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml
index a01916d..1934b6f 100644
--- a/server/tracer/pom.xml
+++ b/server/tracer/pom.xml
@@ -28,13 +28,21 @@
<description>The tracer server for Apache Accumulo to listen for, and store, distributed tracing messages.</description>
<dependencies>
<dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 0a8959c..d024ce4 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -41,6 +41,10 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
@@ -49,6 +53,10 @@
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -97,10 +105,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -116,13 +120,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/shell/pom.xml
----------------------------------------------------------------------
diff --git a/shell/pom.xml b/shell/pom.xml
index 77c2553..10c96ed 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -81,6 +81,10 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
</dependency>
<dependency>
@@ -96,8 +100,12 @@
<artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -116,12 +124,12 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
+ <artifactId>powermock-module-junit4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index 98d6815..b9bdec8 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -47,9 +47,12 @@
<artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -62,35 +65,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-reflect</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cb150189/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 6e768a9..81133b7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -39,16 +39,20 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -100,16 +104,15 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-native</artifactId>
- <type>tar.gz</type>
+ <artifactId>accumulo-proxy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-proxy</artifactId>
+ <artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-server-base</artifactId>
+ <artifactId>accumulo-shell</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -171,18 +174,23 @@
<artifactId>easymock</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-iterator-test-harness</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
[2/2] accumulo git commit: Merge branch 'dep-analyze'
Posted by mw...@apache.org.
Merge branch 'dep-analyze'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/82860ca4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/82860ca4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/82860ca4
Branch: refs/heads/master
Commit: 82860ca44e501488488eff0b01f59c7f1d379233
Parents: 34532dc cb15018
Author: Mike Walch <mw...@apache.org>
Authored: Tue Apr 4 16:55:41 2017 -0400
Committer: Mike Walch <mw...@apache.org>
Committed: Tue Apr 4 16:55:41 2017 -0400
----------------------------------------------------------------------
core/pom.xml | 18 +++++++-------
fate/pom.xml | 4 ---
iterator-test-harness/pom.xml | 8 +++---
maven-plugin/pom.xml | 5 ++--
minicluster/pom.xml | 16 ++++++++++++
pom.xml | 51 +++++++++++++++++++++++++++++++++++---
proxy/pom.xml | 12 ++++++---
server/base/pom.xml | 10 +++++---
server/gc/pom.xml | 17 ++++++++-----
server/master/pom.xml | 21 ++++++++++------
server/monitor/pom.xml | 24 ++++++++----------
server/tracer/pom.xml | 12 +++++++--
server/tserver/pom.xml | 21 ++++++++--------
shell/pom.xml | 18 ++++++++++----
start/pom.xml | 29 +++++-----------------
test/pom.xml | 30 ++++++++++++++--------
16 files changed, 187 insertions(+), 109 deletions(-)
----------------------------------------------------------------------