You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/11/18 07:03:07 UTC
svn commit: r1542908 - in /archiva/trunk:
archiva-modules/archiva-web/archiva-webapp/pom.xml pom.xml
Author: olamy
Date: Mon Nov 18 06:03:07 2013
New Revision: 1542908
URL: http://svn.apache.org/r1542908
Log:
remove configuration for tomcat6 plugin
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/pom.xml
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=1542908&r1=1542907&r2=1542908&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Nov 18 06:03:07 2013
@@ -972,43 +972,6 @@
-->
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <configuration>
- <port>${tomcatRunPort}</port>
- <path>${tomcatRunPath}</path>
- <contextFile>${tomcatContextXml}</contextFile>
- <systemProperties>
- <plexus.home>${archivaAppServerBase}</plexus.home>
- <appserver.base>${archivaAppServerBase}</appserver.base>
- <appserver.home>${archivaAppServerBase}</appserver.home>
- <derby.system.home>${archivaAppServerBase}/logs</derby.system.home>
- <redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties
- </redback.admin.creation.file>
- <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
- <archiva.user.configFileName>${archivaAppServerBase}/conf/archiva.xml</archiva.user.configFileName>
- <archiva.devMode>${archiva.devMode}</archiva.devMode>
- <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
- <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
- </systemProperties>
- <additionalClasspathDirs>
- <additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
- </additionalClasspathDirs>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derbyVersion}</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javaxMailVersion}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<configuration>
<port>${tomcatRunPort}</port>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1542908&r1=1542907&r2=1542908&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Nov 18 06:03:07 2013
@@ -1629,10 +1629,6 @@
</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>
<dependencies>
<dependency>
@@ -1823,11 +1819,6 @@
</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>