You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bh...@apache.org on 2014/04/30 15:19:14 UTC
[12/12] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '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/43a44ba8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43a44ba8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43a44ba8
Branch: refs/heads/master
Commit: 43a44ba82c2d9564cdb8ee5054f16398ebd2836a
Parents: 2881631 15e4f00
Author: Bill Havanki <bh...@cloudera.com>
Authored: Wed Apr 30 09:18:30 2014 -0400
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Wed Apr 30 09:18:30 2014 -0400
----------------------------------------------------------------------
pom.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/43a44ba8/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index df7a5ac,135d15d..78af9c5
--- a/pom.xml
+++ b/pom.xml
@@@ -908,9 -896,12 +908,12 @@@
<artifactId>maven-pmd-plugin</artifactId>
<version>3.1</version>
<configuration>
+ <excludes>
+ <exclude>**/thrift/*.java</exclude>
+ </excludes>
<format>html</format>
<includeTests>true</includeTests>
- <targetJdk>1.6</targetJdk>
+ <targetJdk>1.7</targetJdk>
</configuration>
</plugin>
<plugin>