Author: olamy
Date: Fri Jan 13 17:20:21 2012
New Revision: 1231194
URL: http://svn.apache.org/viewvc?rev=1231194&view=rev
Log:
cleanup poms removing some plugin version duplicate declaration
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1231194&r1=1231193&r2=1231194&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Fri Jan
13 17:20:21 2012
@@ -591,7 +591,6 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
<configuration>
<port>9090</port>
<path>/</path>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml?rev=1231194&r1=1231193&r2=1231194&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
Fri Jan 13 17:20:21 2012
@@ -328,7 +328,6 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.derby</groupId>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1231194&r1=1231193&r2=1231194&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Fri Jan 13
17:20:21 2012
@@ -1414,7 +1414,6 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
<configuration>
<port>9091</port>
<path>/archiva</path>
@@ -1445,7 +1444,6 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
<configuration>
<port>9091</port>
<path>/archiva</path>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1231194&r1=1231193&r2=1231194&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Fri Jan 13 17:20:21 2012
@@ -98,6 +98,7 @@
<plexus-digest.version>1.1</plexus-digest.version>
<plexus-expression-evaluator.version>1.0-rc1</plexus-expression-evaluator.version>
<plexus-utils.version>1.5.5</plexus-utils.version>
+ <asfTomcatMavenPluginVersion>2.0-SNAPSHOT</asfTomcatMavenPluginVersion>
</properties>
<dependencyManagement>
@@ -1447,6 +1448,14 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ </plugin>
<!-- make sure our code doesn't have 1.6 dependencies -->
<!--
TODO check as it currently failed with ".. error in opening zip file ""
@@ -1613,6 +1622,16 @@
<artifactId>tomcat-maven-plugin</artifactId>
<version>1.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
+ <version>${asfTomcatMavenPluginVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>${asfTomcatMavenPluginVersion}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -1744,32 +1763,6 @@
<modules>
<module>archiva-tomcat</module>
</modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</profile>
</profiles>
</project>
