You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2013/11/09 19:00:21 UTC
[1/2] git commit: ACCUMULO-1853 added missing test dependencies for
hadoop 1 build
Updated Branches:
refs/heads/master 4d690b1e0 -> 1037ad23f
ACCUMULO-1853 added missing test dependencies for hadoop 1 build
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/433ad020
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/433ad020
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/433ad020
Branch: refs/heads/master
Commit: 433ad020378ee58ec8f92af499578a09e45f073f
Parents: c68066d
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Sat Nov 9 09:53:45 2013 -0800
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Sat Nov 9 09:53:45 2013 -0800
----------------------------------------------------------------------
core/pom.xml | 10 ++++++++++
examples/simple/pom.xml | 10 ++++++++++
minicluster/pom.xml | 5 +++++
proxy/pom.xml | 5 +++++
start/pom.xml | 5 +++++
test/pom.xml | 15 +++++++++++++++
trace/pom.xml | 5 +++++
7 files changed, 55 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/433ad020/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 0f155be..0a3fe64 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -114,6 +114,11 @@
<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>
@@ -138,6 +143,11 @@
<artifactId>powermock-module-junit4</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/433ad020/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index e3a01a1..66cc2ed 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -64,6 +64,16 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</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>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/433ad020/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 9cc7581..38c1060 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -92,5 +92,10 @@
<artifactId>junit</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/433ad020/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 4c4582d..55d5c86 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -85,6 +85,11 @@
<artifactId>accumulo-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/433ad020/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index 858bf98..ff35a31 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -66,6 +66,11 @@
<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/433ad020/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 36c3655..56b0817 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -121,6 +121,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -140,6 +145,16 @@
<artifactId>hadoop-minicluster</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/433ad020/trace/pom.xml
----------------------------------------------------------------------
diff --git a/trace/pom.xml b/trace/pom.xml
index 08f1972..a0c28b9 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -50,6 +50,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
[2/2] git commit: ACCUMULO-1853 Merge branch '1.6.0-SNAPSHOT'
Posted by bi...@apache.org.
ACCUMULO-1853 Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1037ad23
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1037ad23
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1037ad23
Branch: refs/heads/master
Commit: 1037ad23f117526e68f8d666dc188f26b288513b
Parents: 4d690b1 433ad02
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Sat Nov 9 09:54:40 2013 -0800
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Sat Nov 9 09:54:40 2013 -0800
----------------------------------------------------------------------
core/pom.xml | 10 ++++++++++
examples/simple/pom.xml | 10 ++++++++++
minicluster/pom.xml | 5 +++++
proxy/pom.xml | 5 +++++
start/pom.xml | 5 +++++
test/pom.xml | 15 +++++++++++++++
trace/pom.xml | 5 +++++
7 files changed, 55 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1037ad23/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1037ad23/examples/simple/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1037ad23/minicluster/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1037ad23/proxy/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1037ad23/start/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1037ad23/test/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1037ad23/trace/pom.xml
----------------------------------------------------------------------