Author: olamy
Date: Wed Jun 20 14:31:01 2012
New Revision: 1352127

URL: http://svn.apache.org/viewvc?rev=1352127&view=rev
Log:
avoid it test running twice

Modified:
    maven/plugins/trunk/maven-resources-plugin/pom.xml

Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=1352127&r1=1352126&r2=1352127&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Wed Jun 20 14:31:01 2012
@@ -142,6 +142,41 @@ under the License.
     <profile>
       <id>run-its</id>
       <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-invoker-plugin</artifactId>
+              <version>1.6</version>
+              <configuration>
+                <debug>true</debug>
+                <projectsDirectory>src/it</projectsDirectory>
+                <pomIncludes>
+                  <pomInclude>**/pom.xml</pomInclude>
+                </pomIncludes>
+                <postBuildHookScript>verify</postBuildHookScript>
+                
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+                <goals>
+                  <goal>clean</goal>
+                  <goal>process-test-resources</goal>
+                </goals>
+                <settingsFile>src/it/settings.xml</settingsFile>
+                
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                <properties>
+                  <execProps>fromExecProps</execProps>
+                </properties>
+              </configuration>
+              <dependencies>
+                <!-- this p-u version correctly exclude .gitattributes files 
-->
+                <dependency>
+                  <groupId>org.codehaus.plexus</groupId>
+                  <artifactId>plexus-utils</artifactId>
+                  <version>3.0.1</version>
+                </dependency>
+              </dependencies>
+            </plugin>
+          </plugins>
+        </pluginManagement>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -165,45 +200,6 @@ under the License.
               </execution>
             </executions>
           </plugin>          
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <version>1.6</version>
-            <configuration>
-              <debug>true</debug>
-              <projectsDirectory>src/it</projectsDirectory>
-              <pomIncludes>
-                <pomInclude>**/pom.xml</pomInclude>
-              </pomIncludes>
-              <postBuildHookScript>verify</postBuildHookScript>
-              
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-              <goals>
-                <goal>clean</goal>
-                <goal>process-test-resources</goal>
-              </goals>
-              <settingsFile>src/it/settings.xml</settingsFile>
-              <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-              <properties>
-                <execProps>fromExecProps</execProps>
-              </properties>
-            </configuration>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>install</goal>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-utils</artifactId>
-                <version>3.0.1</version>
-              </dependency>
-            </dependencies>
-          </plugin>
         </plugins>
       </build>
     </profile>


Reply via email to