Author: bentmann
Date: Fri May 1 15:12:04 2009
New Revision: 770707
URL: http://svn.apache.org/viewvc?rev=770707&view=rev
Log:
o Excluded unwanted dependency to prevent class path conflict between
servlet-api:2.3 and servlet-api:2.5
Modified:
maven/mercury/trunk/mercury-core/pom.xml
Modified: maven/mercury/trunk/mercury-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-core/pom.xml?rev=770707&r1=770706&r2=770707&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-core/pom.xml (original)
+++ maven/mercury/trunk/mercury-core/pom.xml Fri May 1 15:12:04 2009
@@ -9,10 +9,10 @@
<name>Mercury Core</name>
<dependencies>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
<!-- SAT solver used to calculate viable ranges when dependencies are
expressed pseudo boolean form -->
<dependency>
@@ -74,13 +74,18 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <!-- prevent conflict with org.mortbay.jetty:servlet-api from
jetty-servlet-tester -->
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
</dependencies>
@@ -125,4 +130,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
