Author: coheigea Date: Wed Aug 1 11:42:18 2012 New Revision: 1367929 URL: http://svn.apache.org/viewvc?rev=1367929&view=rev Log: Merged revisions 1367922 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1367922 | coheigea | 2012-08-01 12:15:48 +0100 (Wed, 01 Aug 2012) | 10 lines Merged revisions 1367920 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1367920 | coheigea | 2012-08-01 12:09:05 +0100 (Wed, 01 Aug 2012) | 2 lines Upgrading to WSS4J 1.6.7 ........ ........ Modified: cxf/branches/2.5.x-fixes/parent/pom.xml Modified: cxf/branches/2.5.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/parent/pom.xml?rev=1367929&r1=1367928&r2=1367929&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.5.x-fixes/parent/pom.xml Wed Aug 1 11:42:18 2012 @@ -102,7 +102,7 @@ <cxf.jibx.version>1.2.4.5</cxf.jibx.version> <cxf.axiom.version>1.2.10</cxf.axiom.version> <cxf.jettison.version>1.3.2</cxf.jettison.version> - <cxf.wss4j.version>1.6.7-SNAPSHOT</cxf.wss4j.version> + <cxf.wss4j.version>1.6.7</cxf.wss4j.version> <cxf.joda.time.version>1.6.2</cxf.joda.time.version> <cxf.opensaml.version>2.5.1</cxf.opensaml.version> <cxf.opensamlws.version>1.4.2-1</cxf.opensamlws.version>
