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/f51e6b0c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f51e6b0c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f51e6b0c Branch: refs/heads/1.7 Commit: f51e6b0c2d8e643344f91ce5d4386a60e9c82324 Parents: 904e957 4f02a65 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Dec 16 14:20:25 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Dec 16 14:20:25 2015 -0500 ---------------------------------------------------------------------- pom.xml | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f51e6b0c/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 8b0c656,8b4e129..c446c19 --- a/pom.xml +++ b/pom.xml @@@ -642,8 -608,7 +642,7 @@@ <configuration> <encoding>${project.reporting.outputEncoding}</encoding> <quiet>true</quiet> - <reportOutputDirectory>docs</reportOutputDirectory> - <javadocVersion>${java.ver}</javadocVersion> + <javadocVersion>${maven.compiler.target}</javadocVersion> <additionalJOption>-J-Xmx512m</additionalJOption> </configuration> </plugin>
