(cxf) 12/16: More fixup

[co...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch coheigea/wss4j-saml-refactor
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 3ff045f39904ceda6d56204eade5ab2487ee8291
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jul 9 14:44:16 2025 +0100

    More fixup
---
 .../apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java  | 2 +-
 .../src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java | 2 +-
 .../java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java     | 2 +-
 .../java/org/apache/cxf/sts/token/validator/X509TokenValidator.java     | 2 +-
 .../src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
index ec178e121d..ac146a3dc4 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java
@@ -55,7 +55,7 @@ import org.apache.wss4j.api.dom.engine.WSSConfig;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.common.saml.message.WSSSAMLKeyInfoProcessor;
 import org.apache.wss4j.api.dom.validate.Credential;
-import org.apache.wss4j.common.dom.validate.SignatureTrustValidator;
+import org.apache.wss4j.dom.validate.SignatureTrustValidator;
 import org.apache.wss4j.api.dom.validate.Validator;
 import org.apache.xml.security.encryption.XMLCipher;
 import org.apache.xml.security.encryption.XMLEncryptionException;
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java
index 80a0a20817..02f85074ee 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java
@@ -27,7 +27,7 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.api.dom.validate.Credential;
-import org.apache.wss4j.common.dom.validate.SignatureTrustValidator;
+import org.apache.wss4j.dom.validate.SignatureTrustValidator;
 
 public class TrustValidator {
     public void validateTrust(Crypto crypto, X509Certificate cert, PublicKey publicKey)
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
index 44670dabc5..6bb5362831 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SAMLTokenValidator.java
@@ -55,7 +55,7 @@ import org.apache.wss4j.api.dom.engine.WSSConfig;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.common.saml.message.WSSSAMLKeyInfoProcessor;
 import org.apache.wss4j.api.dom.validate.Credential;
-import org.apache.wss4j.common.dom.validate.SignatureTrustValidator;
+import org.apache.wss4j.dom.validate.SignatureTrustValidator;
 import org.apache.wss4j.api.dom.validate.Validator;
 import org.opensaml.saml.common.SAMLVersion;
 import org.opensaml.xmlsec.signature.KeyInfo;
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
index ca3dd4e77a..b06d8355ae 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
@@ -46,7 +46,7 @@ import org.apache.wss4j.api.dom.WSConstants;
 import org.apache.wss4j.api.dom.engine.WSSConfig;
 import org.apache.wss4j.api.dom.RequestData;
 import org.apache.wss4j.api.dom.validate.Credential;
-import org.apache.wss4j.common.dom.validate.SignatureTrustValidator;
+import org.apache.wss4j.dom.validate.SignatureTrustValidator;
 import org.apache.wss4j.api.dom.validate.Validator;
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.keys.content.X509Data;
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
index 0eacf3056a..996f591cd2 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
@@ -50,7 +50,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
 import org.apache.cxf.ws.security.wss4j.WSS4JStaxOutInterceptor;
 import org.apache.wss4j.common.ConfigurationConstants;
-import org.apache.wss4j.common.SignatureActionToken;
+import org.apache.wss4j.api.dom.action.SignatureActionToken;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.ext.WSSecurityException;