Author: alessio.soldano(a)jboss.com Date: 2012-02-25 09:30:36 -0500 (Sat, 25 Feb 2012) New Revision: 15745 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 15674 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15674 | alessio.soldano(a)jboss.com | 2012-02-16 16:24:58 +0100 (Thu, 16 Feb 2012) | 2 lines [JBWS-3439] Moving to santuario 1.5.0 and wss4j 1.6.5-SNAPSHOT ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-25 14:15:14 UTC (rev 15744) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-25 14:30:36 UTC (rev 15745) @@ -103,8 +103,8 @@ <jms.api.version>1.0.0.Final</jms.api.version> <velocity.version>1.5</velocity.version> <xerces.version>2.9.1</xerces.version> - <xmlsec.version>1.4.5</xmlsec.version> - <wss4j.version>1.6.4</wss4j.version> + <xmlsec.version>1.5.0</xmlsec.version> + <wss4j.version>1.6.5-SNAPSHOT</wss4j.version> <wstx.version>3.2.9</wstx.version> <spring.version>3.0.6.RELEASE</spring.version> </properties>