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/1.7
Commit: 50f8a7936cf2ad5c1db9d893afcd5ccb30511538
Parents: 21059c5 ec6c0df
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Tue Jun 9 20:11:41 2015 -0400
Committer: Christopher Tubbs <ctubb...@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>
