Return-Path: 
 <commits-return-15963-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 EF75D17B3F
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Wed, 10 Jun 2015 00:19:56 +0000 (UTC)
Received: (qmail 24400 invoked by uid 500); 10 Jun 2015 00:19:56 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 24268 invoked by uid 500); 10 Jun 2015 00:19:56 -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 24206 invoked by uid 99); 10 Jun 2015 00:19:56 -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, 10 Jun 2015 00:19:56 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 6F1ADE02D3; Wed, 10 Jun 2015 00:19:56 +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, 10 Jun 2015 00:19:59 -0000
Message-Id: <0363d4ea0e32425db9232b4574cf6d6c@git.apache.org>
In-Reply-To: <4b256b5513e744fe81d5c10e108c8bd9@git.apache.org>
References: <4b256b5513e744fe81d5c10e108c8bd9@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/6] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7

Conflicts:
	maven-plugin/pom.xml
	pom.xml


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

Branch: refs/heads/master
Commit: 50f8a7936cf2ad5c1db9d893afcd5ccb30511538
Parents: 21059c5 ec6c0df
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Jun 9 20:11:41 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Jun 9 20:11:41 2015 -0400

----------------------------------------------------------------------
 maven-plugin/pom.xml | 80 ++++++++++++++++++++++++++---------------------
 pom.xml              |  2 +-
 2 files changed, 46 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/50f8a793/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --cc maven-plugin/pom.xml
index 9fc167d,e9eec9a..41be7f4
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@@ -83,6 -83,32 +83,35 @@@
            </execution>
          </executions>
        </plugin>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-invoker-plugin</artifactId>
+         <configuration>
+           <noLog>true</noLog>
+           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+           <pomIncludes>
+             <pomInclude>*/pom.xml</pomInclude>
+           </pomIncludes>
+           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+           <settingsFile>src/it/settings.xml</settingsFile>
+           <goals>
+             <goal>clean</goal>
+             <goal>post-integration-test</goal>
+           </goals>
++          <profiles>
++            <profile>!autoformat</profile>
++          </profiles>
+         </configuration>
+         <executions>
+           <execution>
+             <id>integration-test</id>
+             <goals>
+               <goal>install</goal>
+               <goal>run</goal>
+             </goals>
+           </execution>
+         </executions>
+       </plugin>
      </plugins>
    </build>
    <profiles>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/50f8a793/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3815ad7,c9ca616..3477bff
--- a/pom.xml
+++ b/pom.xml
@@@ -654,7 -622,7 +654,7 @@@
              <goals>clean deploy</goals>
              <preparationGoals>clean verify</preparationGoals>
              <tagNameFormat>@{project.version}</tagNameFormat>
-             <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs,!test-accumulo-maven-plugin</releaseProfiles>
 -            <releaseProfiles>seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
++            <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
              <useReleaseProfile>false</useReleaseProfile>
              <pushChanges>false</pushChanges>
              <localCheckout>true</localCheckout>