Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes af21b4656 -> 17614b08d
revert to use opensaml bundle 2.6.1_1
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/ad116084
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ad116084
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ad116084
Branch: refs/heads/2.7.x-fixes
Commit: ad116084ab4fc85e082626bfaa6773026d77e858
Parents: af21b46
Author: Freeman Fang <freeman.f...@gmail.com>
Authored: Thu Oct 9 17:14:48 2014 +0800
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 21 16:20:34 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ad116084/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 112eba9..e152dcd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -137,7 +137,9 @@
<cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>
<cxf.oauth.version>20100527</cxf.oauth.version>
<cxf.opensaml.version>2.6.1</cxf.opensaml.version>
- <cxf.opensaml.osgi.version>2.6.1_2</cxf.opensaml.osgi.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>
