You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2013/09/27 01:49:51 UTC
svn commit: r1526751 - in /tuscany/sca-java-2.x/branches/2.0:
distribution/all/src/main/release/bin/LICENSE
modules/binding-ws-runtime-axis2/pom.xml
testing/compliance-tests/binding-jms/pom.xml
testing/itest/ws/wspolicy/pom.xml
Author: lresende
Date: Thu Sep 26 23:49:51 2013
New Revision: 1526751
URL: http://svn.apache.org/r1526751
Log:
Update wss4j version to 1.5.11 to avoid build issues as 1.5.10 seems corrupted
Modified:
tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
tuscany/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml
tuscany/sca-java-2.x/branches/2.0/testing/compliance-tests/binding-jms/pom.xml
tuscany/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml
Modified: tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE?rev=1526751&r1=1526750&r2=1526751&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE (original)
+++ tuscany/sca-java-2.x/branches/2.0/distribution/all/src/main/release/bin/LICENSE Thu Sep 26 23:49:51 2013
@@ -312,7 +312,7 @@ The following components come under Apac
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
Modified: tuscany/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml?rev=1526751&r1=1526750&r2=1526751&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0/modules/binding-ws-runtime-axis2/pom.xml Thu Sep 26 23:49:51 2013
@@ -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>
Modified: tuscany/sca-java-2.x/branches/2.0/testing/compliance-tests/binding-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/testing/compliance-tests/binding-jms/pom.xml?rev=1526751&r1=1526750&r2=1526751&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/testing/compliance-tests/binding-jms/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0/testing/compliance-tests/binding-jms/pom.xml Thu Sep 26 23:49:51 2013
@@ -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>
Modified: tuscany/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml?rev=1526751&r1=1526750&r2=1526751&view=diff
==============================================================================
--- tuscany/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml (original)
+++ tuscany/sca-java-2.x/branches/2.0/testing/itest/ws/wspolicy/pom.xml Thu Sep 26 23:49:51 2013
@@ -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>