From 9097ec792043adde6dba8bb299e784529ff74ede Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 26 Sep 2013 23:49:51 +0000
Subject: Update wss4j version to 1.5.11 to avoid build issues as 1.5.10 seems
 corrupted

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1526751 13f79535-47bb-0310-9956-ffa450edef68
---
 .../2.0/distribution/all/src/main/release/bin/LICENSE    |  2 +-
 .../2.0/modules/binding-ws-runtime-axis2/pom.xml         | 16 +++++++++++++---
 .../2.0/testing/compliance-tests/binding-jms/pom.xml     | 12 ++++++++++++
 .../branches/2.0/testing/itest/ws/wspolicy/pom.xml       |  2 +-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
index 16b6b43f4a..91a57a642b 100644
--- a/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
@@ -312,7 +312,7 @@ The following components come under Apache Software License 2.0
  wink-client-1.2.0-incubating.jar
  wink-client-apache-httpclient-1.2.0-incubating.jar
  wink-server-1.2.0-incubating.jar 
- wss4j-1.5.10.jar
+ wss4j-1.5.11.jar
  xalan-2.7.0.jar
  xercesImpl-2.8.1.jar
  xmlbeans-2.3.0.jar
diff --git a/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml
index c58e8acb21..d76483cac4 100644
--- a/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml
+++ b/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml
@@ -188,10 +188,20 @@
                <exclusion>
                    <groupId>org.apache.santuario</groupId>
                    <artifactId>xmlsec</artifactId>
-               </exclusion> 
+               </exclusion>
+               <exclusion>
+                   <groupId>org.apache.ws.security</groupId>
+                   <artifactId>wss4j</artifactId>
+               </exclusion>
            </exclusions>                     
-        </dependency> 
-        
+        </dependency>
+
+        <dependency>
+           <groupId>org.apache.ws.security</groupId>
+           <artifactId>wss4j</artifactId>
+           <version>1.5.11</version>
+        </dependency>
+
         <!--  replace the Rampart xmlsec with the version Tuscany is using -->
         <dependency>
             <groupId>org.apache.santuario</groupId>
diff --git a/sca-java-2.x/branches/2.0/testing/compliance-tests/binding-jms/pom.xml b/sca-java-2.x/branches/2.0/testing/compliance-tests/binding-jms/pom.xml
index ad903513b1..ce333f401e 100644
--- a/sca-java-2.x/branches/2.0/testing/compliance-tests/binding-jms/pom.xml
+++ b/sca-java-2.x/branches/2.0/testing/compliance-tests/binding-jms/pom.xml
@@ -36,6 +36,18 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-otests-sca-jms-tests</artifactId>
             <version>2.0.1-SNAPSHOT</version>
+            <exclusions>
+              <exclusion>
+                <groupId>org.apache.ws.security</groupId>
+                <artifactId>wss4j</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.security</groupId>
+            <artifactId>wss4j</artifactId>
+            <version>1.5.11</version>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml b/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml
index 6e4f6217a5..5bc1adee00 100644
--- a/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml
+++ b/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml
@@ -43,7 +43,7 @@
             <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
             <version>2.0.1-SNAPSHOT</version>
        </dependency>
-                
+
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-- 
cgit v1.2.3