Updated Branches: refs/heads/1.6.0-SNAPSHOT 65c75f3b1 -> 1aefb5359
ACCUMULO-1853 updated poms with current dependencies Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1aefb535 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1aefb535 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1aefb535 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 1aefb5359fe69a0d9c0d4c6ecb33fb3540b64b3a Parents: 65c75f3 Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Fri Nov 8 07:39:19 2013 -0800 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Fri Nov 8 07:39:19 2013 -0800 ---------------------------------------------------------------------- core/pom.xml | 14 ++--- examples/simple/pom.xml | 18 +++---- maven-plugin/pom.xml | 58 ++++----------------- maven-plugin/src/it/plugin-test/pom.xml | 5 ++ minicluster/pom.xml | 34 ++++++------ pom.xml | 15 ++++++ proxy/pom.xml | 14 ++--- server/base/pom.xml | 22 +------- server/extras/pom.xml | 30 +++++++++-- server/gc/pom.xml | 39 ++++++++++++++ server/master/pom.xml | 44 ++++++++++++++++ server/monitor/pom.xml | 57 ++++++++++++++++++++ server/tracer/pom.xml | 36 +++++++++++-- server/tserver/pom.xml | 78 ++++++++++++++++++++++++++++ start/pom.xml | 10 ---- test/pom.xml | 46 +++++++--------- trace/pom.xml | 5 -- 17 files changed, 363 insertions(+), 162 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 8b4706b..0f155be 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -74,8 +74,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -114,11 +114,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -135,6 +130,11 @@ </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> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/examples/simple/pom.xml ---------------------------------------------------------------------- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index de60f8d..e3a01a1 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -36,8 +36,12 @@ <artifactId>accumulo-core</artifactId> </dependency> <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -50,16 +54,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index f334795..a2d52f9 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -28,52 +28,24 @@ <description>An Apache Maven plugin for testing software against a test Apache Accumulo instance.</description> <dependencies> <dependency> - <groupId>commons-cli</groupId> - <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> - <dependency> - <groupId>commons-configuration</groupId> - <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> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-minicluster</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> </dependency> <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-minicluster</artifactId> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> + <artifactId>maven-model</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -84,21 +56,9 @@ <artifactId>maven-plugin-annotations</artifactId> </dependency> <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/maven-plugin/src/it/plugin-test/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugin/src/it/plugin-test/pom.xml b/maven-plugin/src/it/plugin-test/pom.xml index 7c430ca..a602042 100644 --- a/maven-plugin/src/it/plugin-test/pom.xml +++ b/maven-plugin/src/it/plugin-test/pom.xml @@ -91,6 +91,11 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/minicluster/pom.xml ---------------------------------------------------------------------- diff --git a/minicluster/pom.xml b/minicluster/pom.xml index b7eaf04..9cc7581 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -36,6 +36,10 @@ </dependency> <dependency> <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-gc</artifactId> </dependency> <dependency> @@ -44,16 +48,19 @@ </dependency> <dependency> <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-tserver</artifactId> + <artifactId>accumulo-server-base</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minicluster</artifactId> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-start</artifactId> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <scope>provided</scope> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-tserver</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs2</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> @@ -71,6 +78,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <scope>provided</scope> @@ -80,15 +92,5 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</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/1aefb535/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 784f219..2eb2197 100644 --- a/pom.xml +++ b/pom.xml @@ -447,12 +447,27 @@ <version>${hadoop.version}</version> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${maven.min-version}</version> + </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <version>${maven.min-version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>${maven.min-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${maven.min-version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/proxy/pom.xml ---------------------------------------------------------------------- diff --git a/proxy/pom.xml b/proxy/pom.xml index dee93a7..4c4582d 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -43,6 +43,10 @@ <artifactId>accumulo-minicluster</artifactId> </dependency> <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-server-base</artifactId> + </dependency> + <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> </dependency> @@ -67,11 +71,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -86,11 +85,6 @@ <artifactId>accumulo-test</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <scope>test</scope> - </dependency> </dependencies> <profiles> <profile> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/server/base/pom.xml ---------------------------------------------------------------------- diff --git a/server/base/pom.xml b/server/base/pom.xml index 6f5f4a7..69c766e 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -32,8 +32,8 @@ <artifactId>jcommander</artifactId> </dependency> <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>commons-codec</groupId> @@ -56,10 +56,6 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> </dependency> @@ -96,24 +92,10 @@ <artifactId>zookeeper</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</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/1aefb535/server/extras/pom.xml ---------------------------------------------------------------------- diff --git a/server/extras/pom.xml b/server/extras/pom.xml index b97103f..ade0c88 100644 --- a/server/extras/pom.xml +++ b/server/extras/pom.xml @@ -28,8 +28,20 @@ <description>A library of additional tools to work with Apache Accumulo.</description> <dependencies> <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-master</artifactId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-server-base</artifactId> </dependency> <dependency> <groupId>org.apache.accumulo</groupId> @@ -40,9 +52,19 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/server/gc/pom.xml ---------------------------------------------------------------------- diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 476489b..c96f517 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -28,10 +28,49 @@ <description>The garbage collecting server for Apache Accumulo to clean up unused files.</description> <dependencies> <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-server-base</artifactId> </dependency> <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/server/master/pom.xml ---------------------------------------------------------------------- diff --git a/server/master/pom.xml b/server/master/pom.xml index eec3b78..69a8bed 100644 --- a/server/master/pom.xml +++ b/server/master/pom.xml @@ -28,10 +28,54 @@ <description>The master server for Apache Accumulo for load balacing and other system-wide operations.</description> <dependencies> <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-server-base</artifactId> </dependency> <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/server/monitor/pom.xml ---------------------------------------------------------------------- diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index 836e3e6..5c12f7c 100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@ -28,10 +28,67 @@ <description>A web server for monitoring Apache Accumulo.</description> <dependencies> <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-server-base</artifactId> </dependency> <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/server/tracer/pom.xml ---------------------------------------------------------------------- diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml index bbe7c6f..254d76f 100644 --- a/server/tracer/pom.xml +++ b/server/tracer/pom.xml @@ -29,12 +29,42 @@ <dependencies> <dependency> <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-server-base</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-start</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/server/tserver/pom.xml ---------------------------------------------------------------------- diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml index 05f8f9f..d453a6b 100644 --- a/server/tserver/pom.xml +++ b/server/tserver/pom.xml @@ -28,10 +28,73 @@ <description>The tablet server for Apache Accumulo to host tablets of data tables.</description> <dependencies> <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </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> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -47,6 +110,21 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/test/resources/*.walog</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <profiles> <profile> <id>rpm</id> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/start/pom.xml ---------------------------------------------------------------------- diff --git a/start/pom.xml b/start/pom.xml index 7e7a5a0..858bf98 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -51,11 +51,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -71,11 +66,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-api-easymock</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index 8e4c152..36c3655 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -31,6 +31,10 @@ <artifactId>jcommander</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> </dependency> @@ -48,6 +52,10 @@ </dependency> <dependency> <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-master</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-minicluster</artifactId> </dependency> <dependency> @@ -56,6 +64,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> @@ -67,13 +79,16 @@ <artifactId>accumulo-tracer</artifactId> </dependency> <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-tserver</artifactId> + </dependency> + <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> </dependency> <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <scope>provided</scope> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> </dependency> <dependency> <groupId>commons-codec</groupId> @@ -106,21 +121,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -136,14 +136,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>2.5.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aefb535/trace/pom.xml ---------------------------------------------------------------------- diff --git a/trace/pom.xml b/trace/pom.xml index 0754041..08f1972 100644 --- a/trace/pom.xml +++ b/trace/pom.xml @@ -46,11 +46,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope>
