Clone
 

colm o heigeartaigh <coheigea@apache.org> in cxf

Recording .gitmergeinfo Changes

Fixing merge

Recording .gitmergeinfo Changes

Removing some unneeded code from the security unit tests

# Conflicts:

# rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java

Removing some unneeded code from the security unit tests

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

EhCache update

EhCache update

# Conflicts:

# parent/pom.xml

Recording .gitmergeinfo Changes

Fixing an issue if a SAML SSO Response is signed

Fixing an issue if a SAML SSO Response is signed

Recording .gitmergeinfo Changes

Fixing failing test

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

NPE fix if a SAML Issuer is null

NPE fix if a SAML Issuer is null

# Conflicts:

# rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

Switch to a single custom content list for master

Allow custom JAXB Elements in an STS RST

# Conflicts:

# services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java

# services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/TokenRequirements.java

Allow custom JAXB Elements in an STS RST

Recording .gitmergeinfo Changes

Fixing merge

Recording .gitmergeinfo Changes

Also return the Assertion that was validated

# Conflicts:

# rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java

Also return the Assertion that was validated

Recording .gitmergeinfo Changes

Make the client address optional for SAML SSO