Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java core/src/main/scripts/generate-thrift.sh core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java pom.xml server/tracer/src/main/scripts/generate-thrift.sh shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d1acd14 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d1acd14 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d1acd14 Branch: refs/heads/master Commit: 4d1acd14a1e864188e28a90e4c84f0389b052da4 Parents: ef2e31a bbcc6da Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Apr 30 13:42:38 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Apr 30 13:42:38 2015 -0400 ---------------------------------------------------------------------- core/src/main/scripts/generate-thrift.sh | 6 +++--- pom.xml | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d1acd14/core/src/main/scripts/generate-thrift.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d1acd14/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index f680f84,9249a5b..c74ad2a --- a/pom.xml +++ b/pom.xml @@@ -119,15 -118,15 +119,17 @@@ <accumulo.release.version>${project.version}</accumulo.release.version> <!-- bouncycastle version for test dependencies --> <bouncycastle.version>1.50</bouncycastle.version> + <!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer --> - <findbugs.version>2.5.5</findbugs.version> ++ <findbugs.version>3.0.0</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 -->