You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2016/02/08 02:57:20 UTC
maven-surefire git commit: [SUREFIRE] fixed m-invoker-p executed twice
Repository: maven-surefire
Updated Branches:
refs/heads/master-local afd505024 -> 502d18442
[SUREFIRE] fixed m-invoker-p executed twice
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/502d1844
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/502d1844
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/502d1844
Branch: refs/heads/master-local
Commit: 502d18442113b4c6c72630dca5842e1eb287b8b0
Parents: afd5050
Author: Tibor17 <ti...@lycos.com>
Authored: Mon Feb 8 02:57:10 2016 +0100
Committer: Tibor17 <ti...@lycos.com>
Committed: Mon Feb 8 02:57:10 2016 +0100
----------------------------------------------------------------------
maven-failsafe-plugin/pom.xml | 58 ++++++++++++++++++++------------------
1 file changed, 31 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/502d1844/maven-failsafe-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index af6b5c4..5ca813a 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -110,27 +110,6 @@
</dependencies>
</plugin>
<plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <showErrors>true</showErrors>
- <streamLogs>true</streamLogs>
- <goals>
- <goal>verify</goal>
- </goals>
- <setupIncludes>
- <setupInclude>dummy-*/pom.xml</setupInclude>
- </setupIncludes>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify.bsh</postBuildHookScript>
- <settingsFile>src/it/settings.xml</settingsFile>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -279,20 +258,45 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <streamLogs>false</streamLogs>
- <skipInstallation>${skipTests}</skipInstallation>
- <skipInvocation>${skipTests}</skipInvocation>
- </configuration>
<executions>
<execution>
- <id>integration-test</id>
+ <id>pre-its</id>
+ <phase>pre-integration-test</phase>
<goals>
<goal>install</goal>
+ </goals>
+ <configuration>
+ <skipInstallation>${skipTests}</skipInstallation>
+ </configuration>
+ </execution>
+ <execution>
+ <id>integration-test</id>
+ <goals>
<goal>run</goal>
</goals>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <setupIncludes>
+ <setupInclude>dummy-*/pom.xml</setupInclude>
+ </setupIncludes>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <postBuildHookScript>verify.bsh</postBuildHookScript>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <skipInvocation>${skipTests}</skipInvocation>
+ <streamLogs>false</streamLogs>
+ <showErrors>true</showErrors>
+ </configuration>
</execution>
</executions>
+ <configuration>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ </configuration>
</plugin>
</plugins>
</build>