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/668c340c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/668c340c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/668c340c Branch: refs/heads/master Commit: 668c340c79919c016571b657c91c6f16fbc0e48b Parents: 84d3e5c 5125e4e Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Feb 2 19:23:32 2016 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Feb 2 19:23:32 2016 -0500 ---------------------------------------------------------------------- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/668c340c/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 653d6ba,5693c95..0ca59d2 --- a/pom.xml +++ b/pom.xml @@@ -126,16 -125,14 +126,16 @@@ <!-- extra release args for testing --> <extraReleaseArgs /> <!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer --> - <findbugs.version>3.0.1</findbugs.version> - <findbugs.version>2.5.5</findbugs.version> ++ <findbugs.version>3.0.3</findbugs.version> <!-- surefire/failsafe plugin option --> <forkCount>1</forkCount> - <!-- overwritten in profiles hadoop-1 or hadoop-2 --> + <!-- overwritten in hadoop profiles --> <hadoop.version>2.2.0</hadoop.version> + <htrace.version>3.1.0-incubating</htrace.version> <httpclient.version>3.1</httpclient.version> - <java.ver>1.6</java.ver> - <jetty.version>8.1.15.v20140411</jetty.version> + <jetty.version>9.1.5.v20140505</jetty.version> + <maven.compiler.source>1.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> <maven.min-version>3.0.4</maven.min-version> <!-- surefire/failsafe plugin option -->
