Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8513b556 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8513b556 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8513b556 Branch: refs/heads/ACCUMULO-1000 Commit: 8513b55607423175cd290d319f7c316bddfaa679 Parents: 057b8d6 3d7a6e7 Author: Eric Newton <e...@apache.org> Authored: Fri Jul 19 16:31:35 2013 -0400 Committer: Eric Newton <e...@apache.org> Committed: Fri Jul 19 16:31:35 2013 -0400 ---------------------------------------------------------------------- maven-plugin/pom.xml | 4 ++ .../src/it/plugin-test/postbuild.groovy | 3 ++ .../apache/accumulo/plugin/CustomFilter.java | 33 +++++++++++++++ .../org/apache/accumulo/plugin/PluginIT.java | 44 ++++++++++++++++++-- .../maven/plugin/AbstractAccumuloMojo.java | 31 +++++++------- .../apache/accumulo/maven/plugin/StartMojo.java | 2 + .../apache/accumulo/maven/plugin/StopMojo.java | 2 + pom.xml | 5 +++ 8 files changed, 107 insertions(+), 17 deletions(-) ----------------------------------------------------------------------