Author: olamy
Date: Thu Jun 16 21:07:03 2011
New Revision: 1136682
URL: http://svn.apache.org/viewvc?rev=1136682&view=rev
Log:
add a tomcat6 profile
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=1136682&r1=1136681&r2=1136682&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Thu
Jun 16 21:07:03 2011
@@ -32,12 +32,13 @@
<properties>
<container.test.port>9696</container.test.port>
<tomcat5x.version>5.5.27</tomcat5x.version>
+ <tomcat6x.version>6.0.32</tomcat6x.version>
<cargo.wait>false</cargo.wait>
<cargo.install.dir>cargo-installs</cargo.install.dir>
<maxWaitTimeInMs>60000</maxWaitTimeInMs>
<!-- TODO: review how appropriate the memory settings are - should work
with less -->
<cargo.jvm.args>-Xmx512m -XX:MaxPermSize=256m</cargo.jvm.args>
- <seleniumPluginVersion>1.1</seleniumPluginVersion>
+ <seleniumPluginVersion>2.0-SNAPSHOT</seleniumPluginVersion>
</properties>
<dependencies>
@@ -446,6 +447,20 @@
</properties>
</profile>
<profile>
+ <id>tomcat6x</id>
+ <activation>
+ <property>
+ <name>tomcat6</name>
+ </property>
+ </activation>
+ <properties>
+ <container.name>tomcat6x</container.name>
+ <container.url>
+
http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat6x.version}/bin/apache-tomcat-${tomcat6x.version}.zip
+ </container.url>
+ </properties>
+ </profile>
+ <profile>
<id>firefox</id>
<activation>
<property>
@@ -563,5 +578,18 @@
</profile>
</profiles>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>codehaus.snapshots</id>
+ <url>https://nexus.codehaus.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
