Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/98f6856b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98f6856b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98f6856b Branch: refs/heads/master Commit: 98f6856b810a185bf98626ce358dc94aef3d0e8d Parents: 5e20645 d950d35 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed May 18 17:32:48 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed May 18 17:32:48 2016 -0400 ---------------------------------------------------------------------- pom.xml | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/98f6856b/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 2497daa,e983f11..55a07b5 --- a/pom.xml +++ b/pom.xml @@@ -822,10 -767,11 +822,13 @@@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> + <!-- overridden version from ASF-17 parent pom --> + <version>1.4.1</version> <configuration> <rules> + <requireJavaVersion> + <version>[${maven.compiler.target},)</version> + </requireJavaVersion> <requireMavenVersion> <version>[${maven.min-version},)</version> </requireMavenVersion>
