From 5f58d69d4db23b5faba2e01634552afa729c3615 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 25 Sep 2012 10:54:39 +0000
Subject: [PATCH] fix archiva-web-common tests

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1389789 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-web-common/pom.xml       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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>
-- 
2.39.5