Author: dkulp
Date: Thu Sep 22 18:03:41 2011
New Revision: 1174291
URL: http://svn.apache.org/viewvc?rev=1174291&view=rev
Log:
Merged revisions 1174278 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1174278 | dkulp | 2011-09-22 13:40:12 -0400 (Thu, 22 Sep 2011) | 1 line
Update to version of OpenSAML used by WSS4J
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1174291&r1=1174290&r2=1174291&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Thu Sep 22 18:03:41 2011
@@ -97,10 +97,10 @@
<cxf.jettison.version>1.3</cxf.jettison.version>
<cxf.wss4j.version>1.6.3-SNAPSHOT</cxf.wss4j.version>
<cxf.joda.time.version>1.6.2</cxf.joda.time.version>
- <cxf.opensaml.version>2.4.1</cxf.opensaml.version>
- <cxf.opensamlws.version>1.4.1</cxf.opensamlws.version>
- <cxf.opensaml.osgi.version>2.4.1_1</cxf.opensaml.osgi.version>
-
<cxf.opensaml.xmltooling.version>1.3.1</cxf.opensaml.xmltooling.version>
+ <cxf.opensaml.version>2.5.1</cxf.opensaml.version>
+ <cxf.opensamlws.version>1.4.2-1</cxf.opensamlws.version>
+ <cxf.opensaml.osgi.version>2.5.1_1-SNAPSHOT</cxf.opensaml.osgi.version>
+
<cxf.opensaml.xmltooling.version>1.3.2-1</cxf.opensaml.xmltooling.version>
<cxf.neethi.version>3.0.1</cxf.neethi.version>
<cxf.velocity.version>1.7</cxf.velocity.version>
