ACCUMULO-3896 Skip plugin ITs with skipTests OR skipITs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec6c0dfc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec6c0dfc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec6c0dfc Branch: refs/heads/1.7 Commit: ec6c0dfc891c3f26e33e2ae22ba2c6d16a704d37 Parents: 18a3ef6 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Jun 9 19:49:21 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Jun 9 19:49:21 2015 -0400 ---------------------------------------------------------------------- maven-plugin/pom.xml | 74 +++++++++++++++++++++++++++-------------------- pom.xml | 2 +- 2 files changed, 43 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec6c0dfc/maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index a560920..e9eec9a 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -83,46 +83,56 @@ </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> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> <profile> - <id>test-accumulo-maven-plugin</id> + <id>skip-plugin-its-with-skipTests</id> + <activation> + <property> + <name>skipTests</name> + </property> + </activation> + <properties> + <invoker.skip>true</invoker.skip> + </properties> + </profile> + <profile> + <id>skip-plugin-its-with-skipITs</id> <activation> <property> - <name>!skipITs</name> + <name>skipITs</name> </property> </activation> - <build> - <plugins> - <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> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <properties> + <invoker.skip>true</invoker.skip> + </properties> </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec6c0dfc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9249a5b..c9ca616 100644 --- a/pom.xml +++ b/pom.xml @@ -622,7 +622,7 @@ <goals>clean deploy</goals> <preparationGoals>clean verify</preparationGoals> <tagNameFormat>@{project.version}</tagNameFormat> - <releaseProfiles>seal-jars,skip-findbugs</releaseProfiles> + <releaseProfiles>seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles> <useReleaseProfile>false</useReleaseProfile> <pushChanges>false</pushChanges> <localCheckout>true</localCheckout>
