Author: antelder
Date: Mon May 18 10:32:57 2009
New Revision: 775890
URL: http://svn.apache.org/viewvc?rev=775890&view=rev
Log:
Merge bouncycastle exclude from 1.x to 1.5
Modified:
tuscany/branches/sca-java-1.5/modules/binding-ws-axis2/ (props changed)
tuscany/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml
tuscany/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCaseFIXME.java
(props changed)
Propchange: tuscany/branches/sca-java-1.5/modules/binding-ws-axis2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 18 10:32:57 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/binding-ws-axis2:671193
+/tuscany/branches/sca-java-1.x/modules/binding-ws-axis2:775888
Modified: tuscany/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml?rev=775890&r1=775889&r2=775890&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml Mon May 18
10:32:57 2009
@@ -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>
Propchange:
tuscany/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCaseFIXME.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 18 10:32:57 2009
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCase.java:671193
+/tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCaseFIXME.java:775888
