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 2011/10/08 21:41:38 UTC
svn commit: r1180473 - in /archiva/trunk:
archiva-modules/archiva-web/archiva-webapp/pom.xml pom.xml
Author: olamy
Date: Sat Oct 8 19:41:37 2011
New Revision: 1180473
URL: http://svn.apache.org/viewvc?rev=1180473&view=rev
Log:
add configurarion to test tomcat7 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=1180473&r1=1180472&r2=1180473&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Sat Oct 8 19:41:37 2011
@@ -1029,6 +1029,35 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <configuration>
+ <port>9091</port>
+ <path>/archiva</path>
+ <contextFile>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</contextFile>
+ <systemProperties>
+ <plexus.home>${basedir}/appserver-base</plexus.home>
+ <appserver.base>${basedir}/appserver-base</appserver.base>
+ <appserver.home>${project.build.directory}/appserver-home</appserver.home>
+ <derby.system.home>${basedir}/appserver-base/logs</derby.system.home>
+ <redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties</redback.admin.creation.file>
+ </systemProperties>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
</profile>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1180473&r1=1180472&r2=1180473&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Sat Oct 8 19:41:37 2011
@@ -1749,6 +1749,11 @@
<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>
@@ -1756,6 +1761,10 @@
<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>