From ad32149035f79024d42dfcab00089937dd3b6c90 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 13 Jan 2012 17:20:21 +0000
Subject: [PATCH] cleanup poms removing some plugin version duplicate
 declaration

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1231194 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-webapp-js/pom.xml     |  1 -
 .../archiva-webapp-test-js/pom.xml            |  1 -
 .../archiva-web/archiva-webapp/pom.xml        |  2 -
 pom.xml                                       | 45 ++++++++-----------
 4 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 5a485f604..5e673663f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -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>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
index 91070fc3d..b9d6f606e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
@@ -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>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 74486a308..92fddf67d 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 3fb1634c3..c9a59be42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
-- 
2.39.5