diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-06-15 21:09:19 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-06-15 21:09:19 +0000 |
| commit | 904b86e39562ff0439ca35e953edfd1181a296ce (patch) | |
| tree | 54908f37196784f4710fe79b038e0d3159a55da4 /archiva-modules | |
| parent | f2809251dc45f432779150caff01b77ac71bcbc8 (diff) | |
| download | archiva-904b86e39562ff0439ca35e953edfd1181a296ce.tar.gz archiva-904b86e39562ff0439ca35e953edfd1181a296ce.zip | |
use tomcat embeded for unit tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1350799 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml | 45 |
1 files changed, 29 insertions, 16 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 b19f64d32..dac20a459 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,8 +31,6 @@ <properties> <archiva.baseRestUrl /> <rest.admin.pwd /> - <test.useTomcat>false</test.useTomcat> - <jettyVersion>7.5.3.v20111011</jettyVersion> <!-- <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl> <redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver> @@ -187,6 +185,10 @@ <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_2.5_spec</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -230,19 +232,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jettyVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-plus</artifactId> - <version>${jettyVersion}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> @@ -317,6 +306,31 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${tomcat7Version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-juli</artifactId> + <version>${tomcat7Version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-logging-juli</artifactId> + <version>${tomcat7Version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + <version>${tomcat7Version}</version> + <scope>provided</scope> + </dependency> + </dependencies> <build> @@ -355,7 +369,6 @@ <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> <redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url> <redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name> <basedir>${basedir}</basedir> |