summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-09-25 10:54:39 +0000
committerOlivier Lamy <olamy@apache.org>2012-09-25 10:54:39 +0000
commit5f58d69d4db23b5faba2e01634552afa729c3615 (patch)
treece86d3fdba8fa0fde45e8ddd59432e95354b4374 /archiva-modules/archiva-web
parentdfe298a09eca895581565c2876184a123c314854 (diff)
downloadarchiva-5f58d69d4db23b5faba2e01634552afa729c3615.tar.gz
archiva-5f58d69d4db23b5faba2e01634552afa729c3615.zip
fix archiva-web-common tests
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1389789 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/pom.xml16
1 files changed, 15 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index fd70481c0..ad24c8112 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -83,7 +83,8 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -183,6 +184,19 @@
<artifactId>jetty-plus</artifactId>
<scope>test</scope>
</dependency>
+ <!-- override transitive from cxf -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jettyVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jettyVersion}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>