You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2014/02/25 06:21:48 UTC
[3/3] git commit: CXF-5565 updated to opensaml 2.6.1
CXF-5565 updated to opensaml 2.6.1
Conflicts:
rt/security/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ceb6b86d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ceb6b86d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ceb6b86d
Branch: refs/heads/2.6.x-fixes
Commit: ceb6b86d6e9c2f81bef7fe96856229c9d4e860fd
Parents: adf55fd
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Feb 25 12:46:02 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Feb 25 13:21:04 2014 +0800
----------------------------------------------------------------------
parent/pom.xml | 2 -
rt/ws/security/pom.xml | 91 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ceb6b86d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 418e206..bc2bbe2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -134,8 +134,6 @@
<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.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.4</cxf.saaj-api.version>
<cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ceb6b86d/rt/ws/security/pom.xml
----------------------------------------------------------------------
diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml
index 3b65bbe..e5ae45a 100644
--- a/rt/ws/security/pom.xml
+++ b/rt/ws/security/pom.xml
@@ -102,6 +102,97 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>${cxf.opensaml.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.owasp.esapi</groupId>
+ <artifactId>esapi</artifactId>
+ </exclusion>
+ <!--exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </exclusion-->
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ca.juliusdavies</groupId>
+ <artifactId>not-yet-commons-ssl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>serializer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>