diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-10-09 14:12:24 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-10-09 14:12:24 +0000 |
| commit | 13bc1609f4a8288707cd4e626cad987cf8f5e3eb (patch) | |
| tree | 84eafe08313327a35b4e42f1c2617d485c1b69a0 /archiva-modules | |
| parent | 19bc832086164cbe807ad3c6bb943f4e40de9bf5 (diff) | |
| download | archiva-13bc1609f4a8288707cd4e626cad987cf8f5e3eb.tar.gz archiva-13bc1609f4a8288707cd4e626cad987cf8f5e3eb.zip | |
add some configuration to run unit tests with embeded tomcat: jetty still default
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1180621 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 90f06a75b..c517f1c3f 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -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> |