Merge branch '1.5' into 1.6
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/627e525b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/627e525b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/627e525b
Branch: refs/heads/1.6
Commit: 627e525b6b881873a1b31d63ca22df26f3b7776f
Parents: dff686b d2c116f
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Thu Jan 8 20:35:48 2015 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Thu Jan 8 20:35:48 2015 -0500
----------------------------------------------------------------------
pom.xml | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 108 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/627e525b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 22d5450,711a21d..6a90918
--- a/pom.xml
+++ b/pom.xml
@@@ -496,21 -367,14 +496,26 @@@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.5.5</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <effort>Max</effort>
+ <failOnError>true</failOnError>
+ <includeTests>true</includeTests>
+ <maxRank>6</maxRank>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.13</version>
+ </plugin>
+ <plugin>
<groupId>com.google.code.sortpom</groupId>
<artifactId>maven-sortpom-plugin</artifactId>
- <version>2.1.0</version>
+ <version>2.3.0</version>
<configuration>
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
<lineSeparator>\n</lineSeparator>
@@@ -676,20 -571,19 +681,33 @@@
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <versionRange>[3.2,)</versionRange>
+ <goals>
+ <goal>helpmojo</goal>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <versionRange>[2.13,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[2.0,)</versionRange>
<goals>
