Author: veithen
Date: Sat Jul 17 21:34:28 2010
New Revision: 965136
URL: http://svn.apache.org/viewvc?rev=965136&view=rev
Log:
Attempt to fix conflicting dependencies between wss4j and opensaml. This in
particular should avoid the double dependency on serializer, which I believe is
the root cause of the build failures seen in Hudson.
Modified:
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=965136&r1=965135&r2=965136&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sat Jul 17 21:34:28 2010
@@ -230,6 +230,21 @@
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<version>${wss4j.version}</version>
+ <exclusions>
+ <!-- We exclude xalan:xalan as a transitive dependency, but
include
+ org.apache.xalan:xalan as a direct dependency. This avoids
+ conflicts with the dependencies of org.opensaml:opensaml
+ (which uses org.apache.xalan:xalan). -->
+ <exclusion>
+ <artifactId>xalan</artifactId>
+ <groupId>xalan</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
