Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 868a01586 -> 79ed5e447
CXF-5565 update to opensaml 2.6.1 with thanks to Jon
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/79ed5e44
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/79ed5e44
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/79ed5e44
Branch: refs/heads/2.7.x-fixes
Commit: 79ed5e44796410bfb9c17fff2bf7862350ce97de
Parents: 868a015
Author: Willem Jiang <[email protected]>
Authored: Thu Feb 20 10:58:50 2014 +0800
Committer: Willem Jiang <[email protected]>
Committed: Thu Feb 20 11:28:55 2014 +0800
----------------------------------------------------------------------
parent/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/79ed5e44/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d529ee0..b4b6a11 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -133,10 +133,10 @@
<cxf.msv.version>2011.1</cxf.msv.version>
<cxf.neethi.version>3.0.3</cxf.neethi.version>
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
- <cxf.opensaml.version>2.5.3</cxf.opensaml.version>
- <cxf.opensaml.osgi.version>2.5.3_3</cxf.opensaml.osgi.version>
-
<cxf.opensaml.xmltooling.version>1.3.4-1</cxf.opensaml.xmltooling.version>
- <cxf.opensamlws.version>1.4.4-1</cxf.opensamlws.version>
+ <cxf.opensaml.version>2.6.1</cxf.opensaml.version>
+ <cxf.opensaml.osgi.version>2.6.1_1</cxf.opensaml.osgi.version>
+
<cxf.opensaml.xmltooling.version>1.4.0_1</cxf.opensaml.xmltooling.version>
+ <cxf.opensamlws.version>1.5.0_1</cxf.opensamlws.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.saaj-api.version>1.3.5</cxf.saaj-api.version>
<cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
