Skip to content

Commit 61bf31e

Browse files
committed
Fixing up backport
1 parent 0ef4ac9 commit 61bf31e

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

rt/rs/security/jose-parent/jose-jaxrs/src/test/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonContainerRequestFilterTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import java.nio.charset.StandardCharsets;
2323
import java.util.Collections;
2424

25-
import jakarta.ws.rs.container.ContainerRequestContext;
26-
import jakarta.ws.rs.core.HttpHeaders;
27-
import jakarta.ws.rs.core.Response;
25+
import javax.ws.rs.container.ContainerRequestContext;
26+
import javax.ws.rs.core.HttpHeaders;
27+
import javax.ws.rs.core.Response;
2828
import org.apache.cxf.bus.managers.PhaseManagerImpl;
2929
import org.apache.cxf.helpers.IOUtils;
3030
import org.apache.cxf.interceptor.Fault;
@@ -155,4 +155,4 @@ public java.util.Collection getAdditionalInterceptors() {
155155
message.setInterceptorChain(chain);
156156
chain.doIntercept(message);
157157
}
158-
}
158+
}

rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/filters/JwtAccessTokenValidatorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import java.lang.reflect.Field;
2222

23-
import jakarta.ws.rs.core.MultivaluedHashMap;
24-
import jakarta.ws.rs.core.MultivaluedMap;
23+
import javax.ws.rs.core.MultivaluedHashMap;
24+
import javax.ws.rs.core.MultivaluedMap;
2525
import org.apache.cxf.jaxrs.ext.MessageContext;
2626
import org.apache.cxf.message.Message;
2727
import org.apache.cxf.message.MessageImpl;
@@ -197,4 +197,4 @@ private static void setThreadLocalMessage(Message message) throws Exception {
197197
tl.set(message);
198198
}
199199
}
200-
}
200+
}

rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
package org.apache.cxf.rs.security.oauth2.services;
2020

21-
import jakarta.ws.rs.core.MultivaluedMap;
21+
import javax.ws.rs.core.MultivaluedMap;
2222
import org.apache.cxf.jaxrs.impl.MetadataMap;
2323
import org.apache.cxf.rs.security.oauth2.common.Client;
2424
import org.apache.cxf.rs.security.oauth2.common.OAuthError;
@@ -127,4 +127,4 @@ OAuthError getError() {
127127
return error;
128128
}
129129
}
130-
}
130+
}

0 commit comments

Comments
 (0)