Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/15e4f002 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/15e4f002 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/15e4f002 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 15e4f002ff8e016c3bcc5ea0613994c92efb6434 Parents: b3e4bec 08c255a Author: Bill Havanki <bhava...@cloudera.com> Authored: Wed Apr 30 09:18:18 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Wed Apr 30 09:18:18 2014 -0400 ---------------------------------------------------------------------- pom.xml | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/15e4f002/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 2f46cae,5f1d20f..135d15d --- a/pom.xml +++ b/pom.xml @@@ -894,8 -783,11 +894,11 @@@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.0.1</version> + <version>3.1</version> <configuration> + <excludes> + <exclude>**/thrift/*.java</exclude> + </excludes> <format>html</format> <includeTests>true</includeTests> <targetJdk>1.6</targetJdk>
