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/617ad7a0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/617ad7a0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/617ad7a0 Branch: refs/heads/1.8 Commit: 617ad7a05a702ab21fb0395a59b41f10f58ad76c Parents: f6465ac a374616 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jul 21 19:56:09 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jul 21 19:56:09 2016 -0400 ---------------------------------------------------------------------- pom.xml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/617ad7a0/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index f599a86,5e66db2..0a8957b --- a/pom.xml +++ b/pom.xml @@@ -753,19 -717,15 +753,26 @@@ </requireProperty> </rules> </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-enforcer-rule</artifactId> + <version>1.15</version> + </dependency> + </dependencies> </plugin> <plugin> + <!-- Allows us to get the apache-ds bundle artifacts --> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.5.3</version> + </plugin> + <plugin> + <groupId>net.revelc.code</groupId> + <artifactId>apilyzer-maven-plugin</artifactId> + <version>1.0.1</version> + </plugin> + <plugin> <groupId>com.googlecode.maven-java-formatter-plugin</groupId> <artifactId>maven-java-formatter-plugin</artifactId> <version>0.4</version>
