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/2da2aafc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2da2aafc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2da2aafc Branch: refs/heads/1.7 Commit: 2da2aafcde94dda7d39c83ce8ecab2f5a78e2a20 Parents: d3e687e 6d85034 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Jun 21 17:42:45 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Jun 21 17:42:45 2016 -0400 ---------------------------------------------------------------------- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2da2aafc/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 27bed62,6b29f4c..d200561 --- a/pom.xml +++ b/pom.xml @@@ -130,12 -129,11 +130,13 @@@ <forkCount>1</forkCount> <!-- 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> + <it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests> - <jetty.version>8.1.15.v20140411</jetty.version> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> + <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.5</maven.min-version> <!-- surefire/failsafe plugin option --> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> @@@ -146,10 -144,11 +147,11 @@@ <!-- overwritten in hadoop profiles --> <slf4j.version>1.7.5</slf4j.version> <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor> + <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests> <!-- Thrift version --> <thrift.version>0.9.1</thrift.version> - <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures 3.3.x compatibility. --> - <zookeeper.version>3.3.6</zookeeper.version> + <!-- ZooKeeper version --> + <zookeeper.version>3.4.6</zookeeper.version> </properties> <dependencyManagement> <dependencies>