Author: olamy
Date: Fri Apr 27 22:10:12 2012
New Revision: 1331614
URL: http://svn.apache.org/viewvc?rev=1331614&view=rev
Log:
svn merge -r 1331609:1331611
https://svn.apache.org/repos/asf/maven/plugin-tools/branches/MPLUGIN-189/
Modified:
maven/plugin-tools/trunk/ (props changed)
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
Propchange: maven/plugin-tools/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Apr 27 22:10:12 2012
@@ -6,3 +6,4 @@ target-eclipse
*.iml
*.ipr
*.iws
+.idea
Propchange: maven/plugin-tools/trunk/
------------------------------------------------------------------------------
svn:mergeinfo = /maven/plugin-tools/branches/MPLUGIN-189:1331610-1331611
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=1331614&r1=1331613&r2=1331614&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Fri Apr 27 22:10:12
2012
@@ -274,30 +274,23 @@
<profile>
<id>run-its</id>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <filterProperties>
- <sitePluginVersion>3.0</sitePluginVersion>
- </filterProperties>
- <goals>
- <goal>verify</goal>
- </goals>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <filterProperties>
+ <sitePluginVersion>3.0</sitePluginVersion>
+ </filterProperties>
<goals>
- <goal>install</goal>
- <goal>run</goal>
+ <goal>verify</goal>
</goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</profile>
</profiles>
