Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/81f1c7d8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81f1c7d8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81f1c7d8 Branch: refs/heads/1.7 Commit: 81f1c7d8047dd7eb5c6f7f1dd4dd12fcbb1ecf72 Parents: 301d91b 95f5aff Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Feb 3 16:51:22 2016 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Feb 3 16:51:22 2016 -0500 ---------------------------------------------------------------------- maven-plugin/pom.xml | 3 ++- maven-plugin/src/it/plugin-test/pom.xml | 7 +++++++ pom.xml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/81f1c7d8/maven-plugin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/81f1c7d8/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 7138c2f,663a79d..940478d --- a/pom.xml +++ b/pom.xml @@@ -794,9 -742,14 +794,9 @@@ </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> + <version>0.11</version> <configuration> <excludes> <exclude>nbproject/**</exclude>
