Merge branch '1.6' into 1.7
Conflicts:
examples/simple/.gitignore
fate/.gitignore
maven-plugin/.gitignore
minicluster/.gitignore
pom.xml
proxy/.gitignore
server/tracer/.gitignore
trace/.gitignore
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5596b016
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5596b016
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5596b016
Branch: refs/heads/1.7
Commit: 5596b016c145dc776fedb74ca51666ab68a630ec
Parents: d4882a1 8c5607e
Author: Josh Elser <els...@apache.org>
Authored: Fri Jan 29 12:14:37 2016 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Fri Jan 29 12:14:37 2016 -0500
----------------------------------------------------------------------
.gitignore | 3 +++
assemble/.gitignore | 3 +++
assemble/pom.xml | 3 +++
core/.gitignore | 5 +++--
core/pom.xml | 3 +++
docs/.gitignore | 3 +++
examples/simple/.gitignore | 3 +++
examples/simple/pom.xml | 3 +++
fate/.gitignore | 3 +++
maven-plugin/.gitignore | 3 +++
minicluster/.gitignore | 4 +++-
pom.xml | 12 ++++++++++++
proxy/.gitignore | 4 +++-
server/base/.gitignore | 3 +++
server/gc/.gitignore | 3 +++
server/master/.gitignore | 3 +++
server/monitor/.gitignore | 3 +++
server/monitor/pom.xml | 3 +++
server/native/.gitignore | 3 +++
server/tracer/.gitignore | 3 +++
server/tserver/.gitignore | 3 +++
server/tserver/pom.xml | 3 +++
shell/.gitignore | 4 +++-
shell/pom.xml | 17 +++++++++++++++++
start/.gitignore | 4 ++++
test/.gitignore | 4 ++++
test/pom.xml | 3 +++
trace/.gitignore | 3 +++
28 files changed, 109 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 56204d2,f97b5ca..e77a822
--- a/.gitignore
+++ b/.gitignore
@@@ -23,3 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/assemble/.gitignore
----------------------------------------------------------------------
diff --cc assemble/.gitignore
index 56204d2,f97b5ca..e77a822
--- a/assemble/.gitignore
+++ b/assemble/.gitignore
@@@ -23,3 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/assemble/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/core/.gitignore
----------------------------------------------------------------------
diff --cc core/.gitignore
index 8847bdd,8c9981c..e77a822
--- a/core/.gitignore
+++ b/core/.gitignore
@@@ -23,5 -23,8 +23,6 @@@
/.pydevproject
/.idea
/*.iml
- /target/
--/bin/
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/docs/.gitignore
----------------------------------------------------------------------
diff --cc docs/.gitignore
index 56204d2,f97b5ca..e77a822
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@@ -23,3 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/examples/simple/.gitignore
----------------------------------------------------------------------
diff --cc examples/simple/.gitignore
index 56204d2,8c9981c..e77a822
--- a/examples/simple/.gitignore
+++ b/examples/simple/.gitignore
@@@ -23,3 -23,8 +23,6 @@@
/.pydevproject
/.idea
/*.iml
-/bin/
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/examples/simple/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/fate/.gitignore
----------------------------------------------------------------------
diff --cc fate/.gitignore
index 56204d2,8c9981c..e77a822
--- a/fate/.gitignore
+++ b/fate/.gitignore
@@@ -23,3 -23,8 +23,6 @@@
/.pydevproject
/.idea
/*.iml
-/bin/
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/maven-plugin/.gitignore
----------------------------------------------------------------------
diff --cc maven-plugin/.gitignore
index 56204d2,0a396d4..e77a822
--- a/maven-plugin/.gitignore
+++ b/maven-plugin/.gitignore
@@@ -23,3 -23,8 +23,6 @@@
/.pydevproject
/.idea
/*.iml
-/target/
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/minicluster/.gitignore
----------------------------------------------------------------------
diff --cc minicluster/.gitignore
index e7d7fb1,f97b5ca..e77a822
--- a/minicluster/.gitignore
+++ b/minicluster/.gitignore
@@@ -23,4 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
- /target/
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index cf1f172,feaa692..653d6ba
--- a/pom.xml
+++ b/pom.xml
@@@ -785,6 -733,23 +785,18 @@@
</execution>
</executions>
</plugin>
+ <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.4</version>
- </plugin>
- <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes>
+ <exclude>nbproject/**</exclude>
+ <exclude>nb-configuration.xml</exclude>
+ <exclude>nbactions.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/proxy/.gitignore
----------------------------------------------------------------------
diff --cc proxy/.gitignore
index 98fdcca,87da2f9..9f52895
--- a/proxy/.gitignore
+++ b/proxy/.gitignore
@@@ -26,4 -29,4 +29,3 @@@
# python ignores
*.pyc
- /bin/
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/server/base/.gitignore
----------------------------------------------------------------------
diff --cc server/base/.gitignore
index 56204d2,f97b5ca..e77a822
--- a/server/base/.gitignore
+++ b/server/base/.gitignore
@@@ -23,3 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/server/gc/.gitignore
----------------------------------------------------------------------
diff --cc server/gc/.gitignore
index 56204d2,f97b5ca..e77a822
--- a/server/gc/.gitignore
+++ b/server/gc/.gitignore
@@@ -23,3 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/server/master/.gitignore
----------------------------------------------------------------------
diff --cc server/master/.gitignore
index 56204d2,f97b5ca..e77a822
--- a/server/master/.gitignore
+++ b/server/master/.gitignore
@@@ -23,3 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/server/monitor/.gitignore
----------------------------------------------------------------------
diff --cc server/monitor/.gitignore
index 56204d2,f97b5ca..e77a822
--- a/server/monitor/.gitignore
+++ b/server/monitor/.gitignore
@@@ -23,3 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/server/monitor/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/server/native/.gitignore
----------------------------------------------------------------------
diff --cc server/native/.gitignore
index 56204d2,f97b5ca..e77a822
--- a/server/native/.gitignore
+++ b/server/native/.gitignore
@@@ -23,3 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/server/tracer/.gitignore
----------------------------------------------------------------------
diff --cc server/tracer/.gitignore
index 56204d2,0a396d4..e77a822
--- a/server/tracer/.gitignore
+++ b/server/tracer/.gitignore
@@@ -23,3 -23,8 +23,6 @@@
/.pydevproject
/.idea
/*.iml
-/target/
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/server/tserver/.gitignore
----------------------------------------------------------------------
diff --cc server/tserver/.gitignore
index 56204d2,f97b5ca..e77a822
--- a/server/tserver/.gitignore
+++ b/server/tserver/.gitignore
@@@ -23,3 -23,7 +23,6 @@@
/.pydevproject
/.idea
/*.iml
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/server/tserver/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/shell/.gitignore
----------------------------------------------------------------------
diff --cc shell/.gitignore
index 59a826f,0000000..e77a822
mode 100644,000000..100644
--- a/shell/.gitignore
+++ b/shell/.gitignore
@@@ -1,26 -1,0 +1,28 @@@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Maven ignores
+/target/
+
+# IDE ignores
+/.settings/
+/.project
+/.classpath
+/.pydevproject
+/.idea
+/*.iml
- /bin/
++/nbproject/
++/nbactions.xml
++/nb-configuration.xml
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/shell/pom.xml
----------------------------------------------------------------------
diff --cc shell/pom.xml
index 782afa1,0000000..4d83afc
mode 100644,000000..100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@@ -1,128 -1,0 +1,145 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-project</artifactId>
+ <version>1.7.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>accumulo-shell</artifactId>
+ <name>Apache Accumulo Shell</name>
+ <description>An interactive shell for accessing Apache Accumulo via a
command line interface.</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>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <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-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</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>
+ <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-tracer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</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>
+ </dependencies>
++ <build>
++ <pluginManagement>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.rat</groupId>
++ <artifactId>apache-rat-plugin</artifactId>
++ <configuration>
++ <excludes>
++ <exclude>nbproject/**</exclude>
++ <exclude>nb-configuration.xml</exclude>
++ <exclude>nbactions.xml</exclude>
++ </excludes>
++ </configuration>
++ </plugin>
++ </plugins>
++ </pluginManagement>
++ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/test/pom.xml
----------------------------------------------------------------------
diff --cc test/pom.xml
index 6723559,45297d8..f9380c0
--- a/test/pom.xml
+++ b/test/pom.xml
@@@ -201,9 -181,11 +201,12 @@@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>compat/japi-compliance/exclude_classes.txt</exclude>
<exclude>system/bench/lib/*splits</exclude>
<exclude>system/continuous/*.txt</exclude>
+ <exclude>nbproject/**</exclude>
+ <exclude>nb-configuration.xml</exclude>
+ <exclude>nbactions.xml</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5596b016/trace/.gitignore
----------------------------------------------------------------------
diff --cc trace/.gitignore
index 56204d2,8c9981c..e77a822
--- a/trace/.gitignore
+++ b/trace/.gitignore
@@@ -23,3 -23,8 +23,6 @@@
/.pydevproject
/.idea
/*.iml
-/bin/
+ /nbproject/
+ /nbactions.xml
+ /nb-configuration.xml
-
