diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-01-13 17:20:21 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-01-13 17:20:21 +0000 |
| commit | ad32149035f79024d42dfcab00089937dd3b6c90 (patch) | |
| tree | d8fde6dc9ca9dc9adf901a69d28f5d3875f84f18 /pom.xml | |
| parent | b23a9411a1e450e857834e3c432f91a99ce76ab4 (diff) | |
| download | archiva-ad32149035f79024d42dfcab00089937dd3b6c90.tar.gz archiva-ad32149035f79024d42dfcab00089937dd3b6c90.zip | |
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
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 45 |
1 files changed, 19 insertions, 26 deletions
@@ -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> |