[jbossws-commits] JBossWS SVN: r15838 - stack/cxf/branches/jbossws-cxf-4.0.x.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-03-05 03:25:42 -0500 (Mon, 05 Mar 2012)
New Revision: 15838

Modified:
   stack/cxf/branches/jbossws-cxf-4.0.x/
   stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Merged revisions 15835 via svnmerge from 
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk

.......
  r15835 | alessio.soldano at jboss.com | 2012-03-05 09:19:18 +0100 (Mon, 05 Mar 2012) | 2 lines
  
  [JBWS-3439] Moving to Apache WSS4J 1.6.5
.......



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,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824
   + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835
Modified: svn:mergeinfo
   - /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824
   + /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml	2012-03-05 08:20:51 UTC (rev 15837)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml	2012-03-05 08:25:42 UTC (rev 15838)
@@ -104,7 +104,7 @@
     <velocity.version>1.6.3</velocity.version>
     <xerces.version>2.9.1</xerces.version>
     <xmlsec.version>1.5.1</xmlsec.version>
-    <wss4j.version>1.6.5-SNAPSHOT</wss4j.version>
+    <wss4j.version>1.6.5</wss4j.version>
     <wstx.version>3.2.9</wstx.version>
     <spring.version>3.0.6.RELEASE</spring.version>
   </properties>