summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml42
1 files changed, 23 insertions, 19 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
index e74b89d440..6fe55240f4 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
@@ -119,14 +119,14 @@
<artifactId>bcprov-jdk14</artifactId>
</exclusion>
<exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15</artifactId>
- </exclusion>
- <exclusion>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
@@ -209,19 +209,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>140</version>
- </dependency>
-
- <!-- replace the Rampart wss4j to avoid corrupted jar -->
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.5.10</version> <!--1.6.9-->
- </dependency>
-
<!-- replace the Rampart xmlsec with the version Tuscany is using -->
<dependency>
<groupId>org.apache.santuario</groupId>
@@ -329,8 +316,25 @@
<artifactId>xml-resolver</artifactId>
</exclusion>
</exclusions>
- </dependency>
-
+ </dependency>
+
+ <!-- force removal of bcprov -->
+ <!--
+ <depedency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>140</version>
+ <scope>provided</scope>
+ </depedency>
+
+ <depedency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>140</version>
+ <scope>provided</scope>
+ </depedency>
+ -->
+
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>