Return-Path: 
 <commits-return-17349-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1BE3918DB4
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Wed,  3 Feb 2016 03:09:00 +0000 (UTC)
Received: (qmail 5703 invoked by uid 500); 3 Feb 2016 03:09:00 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 5565 invoked by uid 500); 3 Feb 2016 03:08:59 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 5338 invoked by uid 99); 3 Feb 2016 03:08:59 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Feb 2016 03:08:59 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 8BF8CE031B; Wed,  3 Feb 2016 03:08:59 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ctubbsii@apache.org
To: commits@accumulo.apache.org
Date: Wed, 03 Feb 2016 03:09:07 -0000
Message-Id: <0aa83544e15c46f8b7e5f7dc9f6b2d0d@git.apache.org>
In-Reply-To: <cef14a7dbb304cff82f5eab668a634e8@git.apache.org>
References: <cef14a7dbb304cff82f5eab668a634e8@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [09/21] accumulo git commit: Merge branch '1.6' into 1.7

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/1.7
Commit: 668c340c79919c016571b657c91c6f16fbc0e48b
Parents: 84d3e5c 5125e4e
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Feb 2 19:23:32 2016 -0500
Committer: Christopher Tubbs <ctubbsii@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 -->