Return-Path: <commits-return-18104-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id E05EB2009EE
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 18 May 2016 23:34:56 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id DF0E4160A00; Wed, 18 May 2016 21:34:56 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 3379A160A2B
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 18 May 2016 23:34:56 +0200 (CEST)
Received: (qmail 33737 invoked by uid 500); 18 May 2016 21:34:55 -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 33477 invoked by uid 99); 18 May 2016 21:34:55 -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, 18 May 2016 21:34:55 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 1E7DFE0050; Wed, 18 May 2016 21:34:55 +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, 18 May 2016 21:35:03 -0000
Message-Id: <4c6f1e674b61470fbf4694495f90b774@git.apache.org>
In-Reply-To: <980ad671b3d2483bbc6db1ed8c9c65ba@git.apache.org>
References: <980ad671b3d2483bbc6db1ed8c9c65ba@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [10/10] accumulo git commit: Merge branch '1.8'
archived-at: Wed, 18 May 2016 21:34:57 -0000

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 98f6856b810a185bf98626ce358dc94aef3d0e8d
Parents: 5e20645 d950d35
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed May 18 17:32:48 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed May 18 17:32:48 2016 -0400

----------------------------------------------------------------------
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/98f6856b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 2497daa,e983f11..55a07b5
--- a/pom.xml
+++ b/pom.xml
@@@ -822,10 -767,11 +822,13 @@@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-enforcer-plugin</artifactId>
 +          <!-- overridden version from ASF-17 parent pom -->
 +          <version>1.4.1</version>
            <configuration>
              <rules>
+               <requireJavaVersion>
+                 <version>[${maven.compiler.target},)</version>
+               </requireJavaVersion>
                <requireMavenVersion>
                  <version>[${maven.min-version},)</version>
                </requireMavenVersion>