Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-01-13 17:20:21 +00:00
parent b23a9411a1
commit ad32149035
4 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-webapp-js/pom.xml
View File

@ -591,7 +591,6 @@
<plugin> <plugin>
<groupId>org.apache.tomcat.maven</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
<configuration> <configuration>
<port>9090</port> <port>9090</port>
<path>/</path> <path>/</path>

1
archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
View File

@ -328,7 +328,6 @@
<plugin> <plugin>
<groupId>org.apache.tomcat.maven</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId> <artifactId>tomcat6-maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>

2
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -1414,7 +1414,6 @@
<plugin> <plugin>
<groupId>org.apache.tomcat.maven</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat6-maven-plugin</artifactId> <artifactId>tomcat6-maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
<configuration> <configuration>
<port>9091</port> <port>9091</port>
<path>/archiva</path> <path>/archiva</path>
@ -1445,7 +1444,6 @@
<plugin> <plugin>
<groupId>org.apache.tomcat.maven</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0-SNAPSHOT</version>
<configuration> <configuration>
<port>9091</port> <port>9091</port>
<path>/archiva</path> <path>/archiva</path>

45
pom.xml
View File

@ -98,6 +98,7 @@
<plexus-digest.version>1.1</plexus-digest.version> <plexus-digest.version>1.1</plexus-digest.version>
<plexus-expression-evaluator.version>1.0-rc1</plexus-expression-evaluator.version> <plexus-expression-evaluator.version>1.0-rc1</plexus-expression-evaluator.version>
<plexus-utils.version>1.5.5</plexus-utils.version> <plexus-utils.version>1.5.5</plexus-utils.version>
<asfTomcatMavenPluginVersion>2.0-SNAPSHOT</asfTomcatMavenPluginVersion>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -1447,6 +1448,14 @@
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>
</plugin> </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 --> <!-- make sure our code doesn't have 1.6 dependencies -->
<!-- <!--
TODO check as it currently failed with ".. error in opening zip file "" TODO check as it currently failed with ".. error in opening zip file ""
@ -1613,6 +1622,16 @@
<artifactId>tomcat-maven-plugin</artifactId> <artifactId>tomcat-maven-plugin</artifactId>
<version>1.1</version> <version>1.1</version>
</plugin> </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> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
@ -1744,32 +1763,6 @@
<modules> <modules>
<module>archiva-tomcat</module> <module>archiva-tomcat</module>
</modules> </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> </profile>
</profiles> </profiles>
</project> </project>