You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/12/07 04:48:12 UTC
[1/4] git commit: ACCUMULO-1864 Drop provided scope and add explicit
dependencies
Updated Branches:
refs/heads/master 4832f90ec -> 0bec52b51
ACCUMULO-1864 Drop provided scope and add explicit dependencies
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7189bb2d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7189bb2d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7189bb2d
Branch: refs/heads/master
Commit: 7189bb2d2e5744e43c19dacb8b50f17540d67565
Parents: 5a179cf
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 6 19:33:17 2013 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 6 19:33:17 2013 -0500
----------------------------------------------------------------------
core/pom.xml | 59 ++++++++------------
examples/simple/pom.xml | 41 +++++++-------
fate/pom.xml | 3 -
minicluster/pom.xml | 25 ++++-----
.../apache/accumulo/minicluster/MemoryUnit.java | 14 ++---
.../minicluster/MiniAccumuloInstance.java | 4 +-
.../minicluster/MiniAccumuloRunner.java | 48 ++++++++--------
.../minicluster/ProcessNotFoundException.java | 2 +-
.../accumulo/minicluster/ProcessReference.java | 6 +-
proxy/pom.xml | 28 ++++------
server/extras/pom.xml | 19 +++----
server/gc/pom.xml | 19 +++----
server/master/pom.xml | 28 ++++------
server/monitor/pom.xml | 29 ++++------
server/tracer/pom.xml | 19 +++----
server/tserver/pom.xml | 55 ++++++++----------
start/pom.xml | 12 ++--
test/pom.xml | 54 +++++++++---------
trace/pom.xml | 11 ++--
19 files changed, 211 insertions(+), 265 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 0a3fe64..10c9bdd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,83 +35,72 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</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.commons</groupId>
- <artifactId>commons-vfs2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <scope>provided</scope>
</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-configuration</groupId>
<artifactId>commons-configuration</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>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</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.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index 66cc2ed..a9c7e26 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -32,41 +32,40 @@
<artifactId>jcommander</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-trace</artifactId>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</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>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/fate/pom.xml
----------------------------------------------------------------------
diff --git a/fate/pom.xml b/fate/pom.xml
index d47cec3..7026135 100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@ -29,17 +29,14 @@
<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.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/minicluster/pom.xml
----------------------------------------------------------------------
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 38c1060..21890e3 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -35,6 +35,18 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -63,29 +75,16 @@
<artifactId>commons-vfs2</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</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.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
index 185ffa0..5beeda8 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MemoryUnit.java
@@ -21,17 +21,17 @@ package org.apache.accumulo.minicluster;
*/
public enum MemoryUnit {
-
- BYTE(1l,""), KILOBYTE(1024l,"K"), MEGABYTE(1024 * 1024l,"M"), GIGABYTE(1024 * 1024 * 1024l,"G");
-
+
+ BYTE(1l, ""), KILOBYTE(1024l, "K"), MEGABYTE(1024 * 1024l, "M"), GIGABYTE(1024 * 1024 * 1024l, "G");
+
private final long multiplier;
private final String suffix;
-
+
private MemoryUnit(long multiplier, String suffix) {
this.multiplier = multiplier;
this.suffix = suffix;
}
-
+
public long toBytes(long memory) {
return memory * multiplier;
}
@@ -41,8 +41,8 @@ public enum MemoryUnit {
}
public static MemoryUnit fromSuffix(String suffix) {
- for(MemoryUnit memoryUnit : MemoryUnit.values()) {
- if(memoryUnit.suffix .equals(suffix))
+ for (MemoryUnit memoryUnit : MemoryUnit.values()) {
+ if (memoryUnit.suffix.equals(suffix))
return memoryUnit;
}
return null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
index 43cae2d..b140d5c 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.conf.Configuration;
*
*/
public class MiniAccumuloInstance extends ZooKeeperInstance {
-
+
/**
* Construct an {@link Instance} entry point to Accumulo using a {@link MiniAccumuloCluster} directory
*/
@@ -48,7 +48,7 @@ public class MiniAccumuloInstance extends ZooKeeperInstance {
throw new IllegalArgumentException(e);
}
}
-
+
private static String getZooKeepersFromDir(File directory) throws FileNotFoundException {
if (!directory.isDirectory())
throw new IllegalArgumentException("Not a directory " + directory.getPath());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
index 12aa8c6..83a22c7 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
@@ -77,14 +77,14 @@ public class MiniAccumuloRunner {
return prop;
}
}
-
+
private static final String FORMAT_STRING = " %-21s %s";
-
+
public static class Opts extends Help {
@Parameter(names = "-p", required = false, description = "properties file name", converter = PropertiesConverter.class)
Properties prop = new Properties();
}
-
+
/**
* Runs the {@link MiniAccumuloCluster} given a -p argument with a property file. Establishes a shutdown port for asynchronous operation.
*
@@ -96,14 +96,14 @@ public class MiniAccumuloRunner {
public static void main(String[] args) throws Exception {
Opts opts = new Opts();
opts.parseArgs(MiniAccumuloRunner.class.getName(), args);
-
+
int shutdownPort = 4445;
-
+
final File tempDir = Files.createTempDir();
String rootPass = opts.prop.containsKey("rootPassword") ? opts.prop.getProperty("rootPassword") : "secret";
-
+
MiniAccumuloConfig config = new MiniAccumuloConfig(tempDir, rootPass);
-
+
if (opts.prop.containsKey("instanceName"))
config.setInstanceName(opts.prop.getProperty("instanceName"));
if (opts.prop.containsKey("numTServers"))
@@ -124,18 +124,18 @@ public class MiniAccumuloRunner {
shutdownPort = Integer.parseInt(opts.prop.getProperty("shutdownPort"));
if (opts.prop.containsKey("useMiniDFS"))
config.useMiniDFS(Boolean.parseBoolean(opts.prop.getProperty("useMiniDFS")));
-
+
Map<String,String> siteConfig = new HashMap<String,String>();
for (Map.Entry<Object,Object> entry : opts.prop.entrySet()) {
String key = (String) entry.getKey();
if (key.startsWith("site."))
siteConfig.put(key.replaceFirst("site.", ""), (String) entry.getValue());
}
-
+
config.setSiteConfig(siteConfig);
-
+
final MiniAccumuloCluster accumulo = new MiniAccumuloCluster(config);
-
+
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
@@ -150,18 +150,18 @@ public class MiniAccumuloRunner {
}
}
});
-
+
accumulo.start();
-
+
printInfo(accumulo, shutdownPort);
-
+
// start a socket on the shutdown port and block- anything connected to this port will activate the shutdown
ServerSocket shutdownServer = new ServerSocket(shutdownPort);
shutdownServer.accept();
-
+
System.exit(0);
}
-
+
private static boolean validateMemoryString(String memoryString) {
String unitsRegex = "[";
MemoryUnit[] units = MemoryUnit.values();
@@ -174,24 +174,24 @@ public class MiniAccumuloRunner {
Pattern p = Pattern.compile("\\d+" + unitsRegex);
return p.matcher(memoryString).matches();
}
-
+
private static void setMemoryOnConfig(MiniAccumuloConfig config, String memoryString) {
setMemoryOnConfig(config, memoryString, null);
}
-
+
private static void setMemoryOnConfig(MiniAccumuloConfig config, String memoryString, ServerType serverType) {
if (!validateMemoryString(memoryString))
throw new IllegalArgumentException(memoryString + " is not a valid memory string");
-
+
long memSize = Long.parseLong(memoryString.substring(0, memoryString.length() - 1));
MemoryUnit memUnit = MemoryUnit.fromSuffix(memoryString.substring(memoryString.length() - 1));
-
+
if (serverType != null)
config.setMemory(serverType, memSize, memUnit);
else
config.setDefaultMemory(memSize, memUnit);
}
-
+
private static void printInfo(MiniAccumuloCluster accumulo, int shutdownPort) {
System.out.println("Mini Accumulo Cluster\n");
System.out.println(String.format(FORMAT_STRING, "Directory:", accumulo.getConfig().getDir().getAbsoluteFile()));
@@ -199,13 +199,13 @@ public class MiniAccumuloRunner {
System.out.println(String.format(FORMAT_STRING, "Instance Name:", accumulo.getConfig().getInstanceName()));
System.out.println(String.format(FORMAT_STRING, "Root Password:", accumulo.getConfig().getRootPassword()));
System.out.println(String.format(FORMAT_STRING, "ZooKeeper:", accumulo.getConfig().getZooKeepers()));
-
+
for (Pair<ServerType,Integer> pair : accumulo.getDebugPorts()) {
System.out.println(String.format(FORMAT_STRING, pair.getFirst().prettyPrint() + " JDWP Host:", "localhost:" + pair.getSecond()));
}
-
+
System.out.println(String.format(FORMAT_STRING, "Shutdown Port:", shutdownPort));
-
+
System.out.println("\n\nSuccessfully started on " + new Date());
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessNotFoundException.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessNotFoundException.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessNotFoundException.java
index ed13760..4f94d8c 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessNotFoundException.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessNotFoundException.java
@@ -19,5 +19,5 @@ package org.apache.accumulo.minicluster;
public class ProcessNotFoundException extends Exception {
private static final long serialVersionUID = 1L;
-
+
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessReference.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessReference.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessReference.java
index 5de99a2..5c801e4 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessReference.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/ProcessReference.java
@@ -26,17 +26,17 @@ public class ProcessReference {
ProcessReference(Process process) {
this.process = process;
}
-
+
@Override
public String toString() {
return process.toString();
}
-
+
@Override
public int hashCode() {
return process.hashCode();
}
-
+
@Override
public boolean equals(Object obj) {
return process.equals(obj);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 55d5c86..b57790e 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -35,6 +35,14 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -47,28 +55,16 @@
<artifactId>accumulo-server-base</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</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.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/server/extras/pom.xml
----------------------------------------------------------------------
diff --git a/server/extras/pom.xml b/server/extras/pom.xml
index ade0c88..8654c9f 100644
--- a/server/extras/pom.xml
+++ b/server/extras/pom.xml
@@ -32,6 +32,10 @@
<artifactId>jcommander</artifactId>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -48,23 +52,16 @@
<artifactId>accumulo-tserver</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</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>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/server/gc/pom.xml
----------------------------------------------------------------------
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index c96f517..22e67cd 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -36,6 +36,10 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -52,23 +56,16 @@
<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.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/server/master/pom.xml
----------------------------------------------------------------------
diff --git a/server/master/pom.xml b/server/master/pom.xml
index 69a8bed..9179c95 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -36,6 +36,14 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -52,28 +60,16 @@
<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.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/server/monitor/pom.xml
----------------------------------------------------------------------
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 5c12f7c..3889b84 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -36,6 +36,10 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
@@ -44,6 +48,10 @@
<artifactId>jline</artifactId>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -60,33 +68,20 @@
<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.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</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>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/server/tracer/pom.xml
----------------------------------------------------------------------
diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml
index 254d76f..357a967 100644
--- a/server/tracer/pom.xml
+++ b/server/tracer/pom.xml
@@ -28,6 +28,10 @@
<description>The tracer server for Apache Accumulo to listen for, and store, distributed tracing messages.</description>
<dependencies>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -48,23 +52,16 @@
<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.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</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/7189bb2d/server/tserver/pom.xml
----------------------------------------------------------------------
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index d453a6b..50391ca 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -36,63 +36,56 @@
<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.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.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index ff35a31..8dc7c64 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -27,28 +27,24 @@
<description>A library for launching Apache Accumulo services.</description>
<dependencies>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs2</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 831c280..3695c91 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -38,10 +38,26 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -91,42 +107,24 @@
<artifactId>accumulo-tserver</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</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>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -249,8 +247,8 @@
<configuration>
<systemProperties>
<property>
- <name>org.apache.accumulo.test.functional.useSslForIT</name>
- <value>${useSslForIT}</value>
+ <name>org.apache.accumulo.test.functional.useSslForIT</name>
+ <value>${useSslForIT}</value>
</property>
</systemProperties>
</configuration>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7189bb2d/trace/pom.xml
----------------------------------------------------------------------
diff --git a/trace/pom.xml b/trace/pom.xml
index a0c28b9..34ed562 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -27,23 +27,20 @@
<description>A distributed tracing library for Apache Accumulo.</description>
<dependencies>
<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.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
[2/4] git commit: ACCUMULO-1942 Make zookeeper provided in example pom
Posted by ct...@apache.org.
ACCUMULO-1942 Make zookeeper provided in example pom
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/072ed618
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/072ed618
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/072ed618
Branch: refs/heads/master
Commit: 072ed61863bec0ee74d8a95bc82a2c81a0c5db5a
Parents: b9adbd7
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 6 22:42:55 2013 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 6 22:42:55 2013 -0500
----------------------------------------------------------------------
examples/simple/pom.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/072ed618/examples/simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index ff9376c..d513e68 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -34,10 +34,6 @@
<artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<scope>provided</scope>
@@ -68,6 +64,11 @@
<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>
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ct...@apache.org.
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/0bec52b5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bec52b5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0bec52b5
Branch: refs/heads/master
Commit: 0bec52b51be05641144089dcc427644a511f658f
Parents: 4832f90 352dc1b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 6 22:47:43 2013 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 6 22:47:43 2013 -0500
----------------------------------------------------------------------
core/pom.xml | 59 ++++++++------------
examples/simple/pom.xml | 41 +++++++-------
fate/pom.xml | 3 -
minicluster/pom.xml | 25 ++++-----
.../apache/accumulo/minicluster/MemoryUnit.java | 14 ++---
.../minicluster/MiniAccumuloInstance.java | 4 +-
.../minicluster/MiniAccumuloRunner.java | 48 ++++++++--------
.../minicluster/ProcessNotFoundException.java | 2 +-
.../accumulo/minicluster/ProcessReference.java | 6 +-
proxy/pom.xml | 28 ++++------
server/extras/pom.xml | 19 +++----
server/gc/pom.xml | 19 +++----
server/master/pom.xml | 28 ++++------
server/monitor/pom.xml | 29 ++++------
server/tracer/pom.xml | 19 +++----
server/tserver/pom.xml | 55 ++++++++----------
start/pom.xml | 12 ++--
test/pom.xml | 54 +++++++++---------
trace/pom.xml | 11 ++--
19 files changed, 211 insertions(+), 265 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/examples/simple/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/fate/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/minicluster/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/proxy/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/extras/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/gc/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/master/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/monitor/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/tracer/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/server/tserver/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/start/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/test/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bec52b5/trace/pom.xml
----------------------------------------------------------------------
[3/4] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by ct...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
examples/simple/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/352dc1b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/352dc1b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/352dc1b8
Branch: refs/heads/master
Commit: 352dc1b8ba693fc0ed53a9610eed052daf3be1b5
Parents: 7189bb2 072ed61
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Dec 6 22:47:12 2013 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Dec 6 22:47:12 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------