Author: olamy
Date: Sun Oct 9 14:12:24 2011
New Revision: 1180621
URL: http://svn.apache.org/viewvc?rev=1180621&view=rev
Log:
add some configuration to run unit tests with embeded tomcat: jetty still
default
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1180621&r1=1180620&r2=1180621&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Sun Oct 9 14:12:24 2011
@@ -31,7 +31,9 @@
<properties>
<jettyVersion>7.4.5.v20110725</jettyVersion>
<archiva.baseRestUrl></archiva.baseRestUrl>
+ <tomcatVersion>7.0.21</tomcatVersion>
<rest.admin.pwd></rest.admin.pwd>
+ <test.useTomcat>false</test.useTomcat>
</properties>
<dependencies>
@@ -194,6 +196,34 @@
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcatVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcatVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>${tomcatVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-juli</artifactId>
+ <version>${tomcatVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
@@ -275,6 +305,7 @@
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
<archiva.baseRestUrl>${archiva.baseRestUrl}</archiva.baseRestUrl>
<rest.admin.pwd>${rest.admin.pwd}</rest.admin.pwd>
+ <test.useTomcat>${test.useTomcat}</test.useTomcat>
</systemPropertyVariables>
</configuration>
</plugin>
