Author: olamy
Date: Tue Sep 25 10:54:39 2012
New Revision: 1389789
URL: http://svn.apache.org/viewvc?rev=1389789&view=rev
Log:
fix archiva-web-common tests
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml?rev=1389789&r1=1389788&r2=1389789&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml Tue
Sep 25 10:54:39 2012
@@ -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>
