Repository: cxf Updated Branches: refs/heads/2.6.x-fixes 5757af9d3 -> ceb6b86d6 refs/heads/2.7.x-fixes 5b2147126 -> 0bd7c311f
CXF-5565 updated to opensaml 2.6.1 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0bd7c311 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0bd7c311 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0bd7c311 Branch: refs/heads/2.7.x-fixes Commit: 0bd7c311f46a16d17e68e3d505cd04106feaa669 Parents: 5b21471 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Tue Feb 25 12:46:02 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Tue Feb 25 12:46:02 2014 +0800 ---------------------------------------------------------------------- parent/pom.xml | 2 - rt/security/pom.xml | 86 ++++++++++++++++++++++++++++++++++++++++++ rt/ws/security/pom.xml | 91 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/0bd7c311/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b4b6a11..7799798 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -135,8 +135,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.5</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/0bd7c311/rt/security/pom.xml ---------------------------------------------------------------------- diff --git a/rt/security/pom.xml b/rt/security/pom.xml index 9f97de1..87d5326 100644 --- a/rt/security/pom.xml +++ b/rt/security/pom.xml @@ -60,9 +60,95 @@ </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.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> + <!-- logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${cxf.slf4j.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> http://git-wip-us.apache.org/repos/asf/cxf/blob/0bd7c311/rt/ws/security/pom.xml ---------------------------------------------------------------------- diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml index 7fdcae8..6ed6d71 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>
