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/ca2d4ebd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca2d4ebd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca2d4ebd Branch: refs/heads/master Commit: ca2d4ebd904240796c5a0cf9eb75881b60d47ea1 Parents: 94008f6 1645b4f Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Apr 18 12:37:51 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Apr 18 12:37:51 2014 -0400 ---------------------------------------------------------------------- pom.xml | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ca2d4ebd/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 2f22beb,f109643..6a82507 --- a/pom.xml +++ b/pom.xml @@@ -523,9 -517,11 +523,11 @@@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <optimize>true</optimize> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> </configuration> </plugin> <plugin>
