Clone
 

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

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

Add some hooks to either set or get some information relating to the kerberos authentication process

Add some hooks to either set or get some information relating to the kerberos authentication process

# Conflicts:

# rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java

# rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

Minor fix to last commit

Minor fix to last commit

# Conflicts:

# services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java

Recording .gitmergeinfo Changes

Updating Kerby

Recording .gitmergeinfo Changes

Updating neethi

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

Updating WSS4J

Picking up released WSS4J version

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

CXF-7488 - "Protocol Mismatch when using Netty with TLS"

# Conflicts:

# rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java

CXF-7488 - "Protocol Mismatch when using Netty with TLS"

Recording .gitmergeinfo Changes

Recording .gitmergeinfo Changes

Picking up Santuario release

Picking up Santuario release

# Conflicts:

# parent/pom.xml

Picking up Santuario release

# Conflicts:

# parent/pom.xml

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