Merge branch '1.7'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6df8991
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6df8991
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6df8991
Branch: refs/heads/master
Commit: f6df8991b078df1d1a58fa31995f1205941d5af2
Parents: 93f285e 50f8a79
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Tue Jun 9 20:19:20 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Tue Jun 9 20:19:20 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/f6df8991/maven-plugin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6df8991/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 7f8da69,3477bff..5990d63
--- a/pom.xml
+++ b/pom.xml
@@@ -665,7 -654,7 +665,7 @@@
<goals>clean deploy</goals>
<preparationGoals>clean verify</preparationGoals>
<tagNameFormat>@{project.version}</tagNameFormat>
-
<releaseProfiles>apache-release,accumulo-release,!test-accumulo-maven-plugin</releaseProfiles>
-
<releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
++
<releaseProfiles>apache-release,accumulo-release,skip-plugin-its-with-skipTests</releaseProfiles>
<useReleaseProfile>false</useReleaseProfile>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
