This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch CXF-9008
in repository https://gitbox.apache.org/repos/asf/cxf.git
from ed4e228b24b Merge remote-tracking branch 'origin/main' into CXF-9008
add 908e26f6583 fix up conflicts resolve leftover
No new revisions were added by this update.
Summary of changes:
.../kerberos/wssec/spnego/SpnegoServer.java | 1 -
.../cxf/systest/https/conduit/pkcs12-fips.xml | 4 +-
.../https/conduit/resource-key-spec-fips.xml | 4 +-
.../https/conduit/resource-key-spec-url-fips.xml | 4 +-
.../secconv/SecureConversationStaxServer.java | 5 +-
.../systest/wssec/examples/saml/server-fips.xml | 24 ++---
.../wssec/examples/saml/stax-server-fips.xml | 22 ++---
.../systest/wssec/examples/secconv/server-fips.xml | 2 +-
.../wssec/examples/secconv/stax-server-fips.xml | 2 +-
.../cxf/systest/wssec/examples/ut/server-fips.xml | 16 ++--
.../systest/wssec/examples/ut/stax-server-fips.xml | 16 ++--
.../systest/wssec/examples/x509/server-fips.xml | 8 +-
.../wssec/examples/x509/stax-server-fips.xml | 8 +-
.../apache/cxf/systest/ws/swa/SWAActionServer.java | 4 +-
.../apache/cxf/systest/ws/swa/SWAPolicyServer.java | 4 +-
.../systest/ws/ut/UsernameTokenPolicyServer.java | 4 +-
.../cxf/systest/ws/ut/UsernameTokenServer.java | 4 +-
.../ws/ut/UsernameTokenStaxPolicyServer.java | 4 +-
.../cxf/systest/ws/ut/UsernameTokenStaxServer.java | 4 +-
.../WSSecurity10CustomAlgorithmSuiteTest.java | 1 -
.../cxf/systest/ws/wssec10/WSSecurity10Test.java | 4 +-
.../apache/cxf/systest/ws/action/server-fips.xml | 32 +++----
.../apache/cxf/systest/ws/algsuite/server-fips.xml | 24 ++---
.../cxf/systest/ws/algsuite/stax-server-fips.xml | 10 +-
.../ws/basicauth/server-continuation-fips.xml | 6 +-
.../cxf/systest/ws/basicauth/server-fips.xml | 6 +-
.../apache/cxf/systest/ws/bindings/server-fips.xml | 42 ++++-----
.../cxf/systest/ws/bindings/stax-server-fips.xml | 42 ++++-----
.../apache/cxf/systest/ws/cache/server-fips.xml | 4 +-
.../apache/cxf/systest/ws/fault/server-fips.xml | 16 ++--
.../org/apache/cxf/systest/ws/gcm/server-fips.xml | 6 +-
.../apache/cxf/systest/ws/gcm/stax-server-fips.xml | 6 +-
.../apache/cxf/systest/ws/httpget/server-fips.xml | 4 +-
.../apache/cxf/systest/ws/https/server-fips.xml | 16 ++--
.../cxf/systest/ws/https/stax-server-fips.xml | 16 ++--
.../org/apache/cxf/systest/ws/mtom/server-fips.xml | 16 ++--
.../cxf/systest/ws/mtom/stax-server-fips.xml | 6 +-
.../apache/cxf/systest/ws/parts/server-fips.xml | 42 ++++-----
.../cxf/systest/ws/parts/stax-server-fips.xml | 40 ++++----
.../apache/cxf/systest/ws/password/server-fips.xml | 6 +-
.../systest/ws/policy/operation/server-fips.xml | 2 +-
.../apache/cxf/systest/ws/policy/server-fips.xml | 14 +--
.../org/apache/cxf/systest/ws/saml/server-fips.xml | 50 +++++-----
.../cxf/systest/ws/saml/stax-server-fips.xml | 50 +++++-----
.../systest/ws/saml/subjectconf/server-fips.xml | 6 +-
.../ws/saml/subjectconf/stax-server-fips.xml | 6 +-
.../apache/cxf/systest/ws/security/server-fips.xml | 4 +-
.../cxf/systest/ws/security/stax-server-fips.xml | 4 +-
.../cxf/systest/ws/swa/policy-server-fips.xml | 14 +--
.../org/apache/cxf/systest/ws/swa/server-fips.xml | 10 +-
.../apache/cxf/systest/ws/tokens/server-fips.xml | 18 ++--
.../cxf/systest/ws/tokens/stax-server-fips.xml | 18 ++--
.../cxf/systest/ws/ut/policy-server-fips.xml | 30 +++---
.../org/apache/cxf/systest/ws/ut/server-fips.xml | 28 +++---
.../cxf/systest/ws/ut/stax-policy-server-fips.xml | 28 +++---
.../apache/cxf/systest/ws/ut/stax-server-fips.xml | 28 +++---
.../apache/cxf/systest/ws/wssec10/server-fips.xml | 10 +-
.../wssec10/server_customAlgorithmSuite-fips.xml | 10 +-
.../systest/ws/wssec10/server_restricted-fips.xml | 10 +-
.../cxf/systest/ws/wssec10/stax-server-fips.xml | 10 +-
.../stax-server_customAlgorithmSuite-fips.xml | 10 +-
.../ws/wssec10/stax-server_restricted-fips.xml | 10 +-
.../org/apache/cxf/systest/ws/x509/server-fips.xml | 104 ++++++++++-----------
.../cxf/systest/ws/x509/stax-server-fips.xml | 104 ++++++++++-----------
.../org/apache/cxf/systest/ws/xkms/server-fips.xml | 4 +-
.../cxf/systest/ws/xkms/stax-server-fips.xml | 4 +-
66 files changed, 536 insertions(+), 535 deletions(-)
