summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-05-18 10:32:57 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-05-18 10:32:57 +0000
commit0ba9537d2cdbf1527118555e7ee5a6cc258e4189 (patch)
tree21ce6f2a902961eeb8cef60b0b4c42913d1f0937
parente037d92affa7253369145f9953101122919f1717 (diff)
Merge bouncycastle exclude from 1.x to 1.5
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775890 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml b/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml
index d01c0009d8..b950692d72 100644
--- a/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml
+++ b/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml
@@ -206,6 +206,12 @@
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<version>1.5.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>