Author: olamy
Date: Mon Apr 30 08:55:00 2012
New Revision: 1332125
URL: http://svn.apache.org/viewvc?rev=1332125&view=rev
Log:
pom cleanup move plugin version in root pom
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1332125&r1=1332124&r2=1332125&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Apr 30 08:55:00 2012
@@ -502,6 +502,11 @@
<plugins>
<!-- Override settings inherited from parent POM -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1332125&r1=1332124&r2=1332125&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Mon Apr 30 08:55:00
2012
@@ -173,20 +173,6 @@
<filtering>true</filtering>
</testResource>
</testResources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <nonFilteredFileExtensions>
- <nonFilteredFileExtensions>war</nonFilteredFileExtensions>
- </nonFilteredFileExtensions>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -200,7 +186,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
<executions>
<execution>
<phase>pre-integration-test</phase>
@@ -212,7 +197,6 @@
<unzip src="src/test/manager.war" dest="${managerWebAppPath}"
/>
</target>
</configuration>
-
</execution>
</executions>
</plugin>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1332125&r1=1332124&r2=1332125&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Mon Apr 30 08:55:00
2012
@@ -238,7 +238,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
<executions>
<execution>
<phase>pre-integration-test</phase>
@@ -250,7 +249,6 @@
<unzip src="src/test/manager.war" dest="${managerWebAppPath}"
/>
</target>
</configuration>
-
</execution>
</executions>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
