Clone
 

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

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

Picking up WSS4J release

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

Fixing ports

Fixing ports

# Conflicts:

# services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java

Fixing ports

# Conflicts:

# services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java

Backporting fix for CVE-2017-5656

Fixing merge

Re-enabling SAML tests in ws-security

Re-enabling SAML SSO tests

Re-enabling SAML tests

Reverting jibx change

Recording .gitmergeinfo Changes

Updating to WSS4J SNAPSHOT

Recording .gitmergeinfo Changes

Adding test for WSS-608

# Conflicts:

# systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java

Adding test for WSS-608

Recording .gitmergeinfo Changes

NPE fix if the resource can't be loaded

NPE fix if the resource can't be loaded

# Conflicts:

# rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java

NPE fix if the resource can't be loaded

Recording .gitmergeinfo Changes

Allow the password for signing to come from the crypto properties file

Allow the password for signing to come from the crypto properties file

Recording .gitmergeinfo Changes

Fix the systests to work when testutils is not built locally

Fix the systests to work when testutils is not built locally