Return-Path: 
 <commits-return-17288-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 86D3A180C0
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Fri, 22 Jan 2016 17:58:07 +0000 (UTC)
Received: (qmail 21416 invoked by uid 500); 22 Jan 2016 17:58:07 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 21291 invoked by uid 500); 22 Jan 2016 17:58:07 -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 21186 invoked by uid 99); 22 Jan 2016 17:58:07 -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; Fri, 22 Jan 2016 17:58:07 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 12C75E0901; Fri, 22 Jan 2016 17:58:07 +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: Fri, 22 Jan 2016 17:58:10 -0000
Message-Id: <67bc32405dfe4037b66919cfb8a8a318@git.apache.org>
In-Reply-To: <6fb74208dcfe4c97ae1a7f3c9825143c@git.apache.org>
References: <6fb74208dcfe4c97ae1a7f3c9825143c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [04/12] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7

Conflicts:
	assemble/build.sh
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e5401db1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e5401db1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e5401db1

Branch: refs/heads/1.7
Commit: e5401db1ce74d69f126519e57331b50f968b9422
Parents: 0720515 34bd263
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Jan 22 12:20:42 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Jan 22 12:20:42 2016 -0500

----------------------------------------------------------------------
 assemble/build.sh | 276 +++++++++++++++++++++++++++++++++++++------------
 pom.xml           |   4 +-
 2 files changed, 213 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e5401db1/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3fc5d96,3238007..cf1f172
--- a/pom.xml
+++ b/pom.xml
@@@ -123,17 -122,17 +123,19 @@@
      <bouncycastle.version>1.50</bouncycastle.version>
      <!-- relative path for Eclipse format; should override in child modules if necessary -->
      <eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
+     <!-- 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>2.5.5</findbugs.version>
 +    <findbugs.version>3.0.1</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 -->
@@@ -649,8 -620,10 +651,8 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-release-plugin</artifactId>
 -          <!-- Work around MRELEASE-812 -->
 -          <version>2.5</version>
            <configuration>
-             <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
 -            <arguments>-P !autoformat,apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
++            <arguments>-P !autoformat,thrift,assemble,docs,sunny -Dtimeout.factor=2 ${extraReleaseArgs}</arguments>
              <autoVersionSubmodules>true</autoVersionSubmodules>
              <goals>clean deploy</goals>
              <preparationGoals>clean verify</preparationGoals>