Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 3569c2254 -> 2a5237b38
Revert "CXF-5565 update to opensaml 2.6.1 with thanks to Jon"
This reverts commit adf55fd78c61c485accbb5f31274d68dc6b1361e.
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/0e61c85c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0e61c85c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0e61c85c
Branch: refs/heads/2.6.x-fixes
Commit: 0e61c85cf844d56042567d49b5db1e5c73059e11
Parents: 3569c22
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 12:41:12 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 12:41:12 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e61c85c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 127ce56..08ad8fc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -130,8 +130,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.6.1</cxf.opensaml.version>
- <cxf.opensaml.osgi.version>2.6.1_1</cxf.opensaml.osgi.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_2</cxf.opensaml.osgi.version>
+
<cxf.opensaml.xmltooling.version>1.3.2-1</cxf.opensaml.xmltooling.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.saaj-api.version>1.3.4</cxf.saaj-api.version>
<cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
