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/7cffcfcc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7cffcfcc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7cffcfcc Branch: refs/heads/1.8 Commit: 7cffcfcc3dfcee9ca37c2b90af38e4aeea1f0294 Parents: 04d0c19 078f7b7 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed May 18 17:30:36 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed May 18 17:30:36 2016 -0400 ---------------------------------------------------------------------- pom.xml | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7cffcfcc/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 90f6311,d4b3867..0418ab5 --- a/pom.xml +++ b/pom.xml @@@ -734,6 -693,9 +734,9 @@@ <artifactId>maven-enforcer-plugin</artifactId> <configuration> <rules> + <requireJavaVersion> - <version>[${java.ver},)</version> ++ <version>[${maven.compiler.target},)</version> + </requireJavaVersion> <requireMavenVersion> <version>[${maven.min-version},)</version> </requireMavenVersion>
