This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 61bf31ed29f6b69027c8b9521646cdc59f247480 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Thu Jun 25 08:12:18 2026 +0100 Fixing up backport --- .../rs/security/jose/jaxrs/JwsJsonContainerRequestFilterTest.java | 8 ++++---- .../rs/security/oauth2/filters/JwtAccessTokenValidatorTest.java | 6 +++--- .../cxf/rs/security/oauth2/services/AbstractTokenServiceTest.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/test/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonContainerRequestFilterTest.java b/rt/rs/security/jose-parent/jose-jaxrs/src/test/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonContainerRequestFilterTest.java index f51e0fc397d..545e093d304 100644 --- a/rt/rs/security/jose-parent/jose-jaxrs/src/test/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonContainerRequestFilterTest.java +++ b/rt/rs/security/jose-parent/jose-jaxrs/src/test/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonContainerRequestFilterTest.java @@ -22,9 +22,9 @@ import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.util.Collections; -import jakarta.ws.rs.container.ContainerRequestContext; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; import org.apache.cxf.bus.managers.PhaseManagerImpl; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.interceptor.Fault; @@ -155,4 +155,4 @@ public class JwsJsonContainerRequestFilterTest { message.setInterceptorChain(chain); chain.doIntercept(message); } -} \ No newline at end of file +} diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/filters/JwtAccessTokenValidatorTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/filters/JwtAccessTokenValidatorTest.java index e2f96ce609e..bf161fc2e46 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/filters/JwtAccessTokenValidatorTest.java +++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/filters/JwtAccessTokenValidatorTest.java @@ -20,8 +20,8 @@ package org.apache.cxf.rs.security.oauth2.filters; import java.lang.reflect.Field; -import jakarta.ws.rs.core.MultivaluedHashMap; -import jakarta.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.MultivaluedHashMap; +import javax.ws.rs.core.MultivaluedMap; import org.apache.cxf.jaxrs.ext.MessageContext; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; @@ -197,4 +197,4 @@ public class JwtAccessTokenValidatorTest { tl.set(message); } } -} \ No newline at end of file +} diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenServiceTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenServiceTest.java index 4e56b366987..f2c0c8f964d 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenServiceTest.java +++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenServiceTest.java @@ -18,7 +18,7 @@ */ package org.apache.cxf.rs.security.oauth2.services; -import jakarta.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.MultivaluedMap; import org.apache.cxf.jaxrs.impl.MetadataMap; import org.apache.cxf.rs.security.oauth2.common.Client; import org.apache.cxf.rs.security.oauth2.common.OAuthError; @@ -127,4 +127,4 @@ public class AbstractTokenServiceTest { return error; } } -} \ No newline at end of file +}
