From 0b4f40f89b0164fbe4f43be7eed7689326a87a48 Mon Sep 17 00:00:00 2001 From: Peter Zaoral Date: Fri, 3 Mar 2023 10:28:37 +0100 Subject: [PATCH] Quarkus3 branch sync no. 8 3.3.2023: * renamed imports from javax to jakarta as a part of the migration from JavaEE to JakartaEE Signed-off-by: Peter Zaoral --- .../runtime/configuration/PropertyMappingInterceptor.java | 2 +- server-spi/src/main/java/org/keycloak/http/HttpCookie.java | 2 +- .../src/main/java/org/keycloak/services/HttpResponseImpl.java | 2 +- .../testsuite/util/saml/SamlBackchannelLogoutReceiver.java | 2 +- .../test/java/org/keycloak/testsuite/cookies/CookieTest.java | 2 +- .../src/test/java/org/keycloak/testsuite/saml/LogoutTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java index dc2deb585f..280cfaf5a4 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java @@ -19,7 +19,7 @@ package org.keycloak.quarkus.runtime.configuration; import java.util.HashMap; import java.util.Map; import java.util.Optional; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import io.smallrye.config.ConfigSourceInterceptor; import io.smallrye.config.ConfigSourceInterceptorContext; diff --git a/server-spi/src/main/java/org/keycloak/http/HttpCookie.java b/server-spi/src/main/java/org/keycloak/http/HttpCookie.java index 1f91771b08..4ee3b8c238 100644 --- a/server-spi/src/main/java/org/keycloak/http/HttpCookie.java +++ b/server-spi/src/main/java/org/keycloak/http/HttpCookie.java @@ -24,7 +24,7 @@ import org.keycloak.common.util.ServerCookie.SameSiteAttributeValue; * An extension of {@link javax.ws.rs.core.Cookie} in order to support additional * fields and behavior. */ -public final class HttpCookie extends javax.ws.rs.core.Cookie { +public final class HttpCookie extends jakarta.ws.rs.core.Cookie { private final String comment; private final int maxAge; diff --git a/services/src/main/java/org/keycloak/services/HttpResponseImpl.java b/services/src/main/java/org/keycloak/services/HttpResponseImpl.java index f9cb48647f..623850be9e 100644 --- a/services/src/main/java/org/keycloak/services/HttpResponseImpl.java +++ b/services/src/main/java/org/keycloak/services/HttpResponseImpl.java @@ -20,7 +20,7 @@ package org.keycloak.services; import java.util.HashSet; import java.util.Set; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.keycloak.http.HttpCookie; import org.keycloak.http.HttpResponse; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelLogoutReceiver.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelLogoutReceiver.java index 96141346f5..d0cd87f904 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelLogoutReceiver.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelLogoutReceiver.java @@ -17,7 +17,7 @@ import org.keycloak.saml.processing.api.saml.v2.response.SAML2Response; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.w3c.dom.Document; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import java.io.IOException; import java.io.OutputStream; import java.net.InetAddress; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java index 30d5b75de0..82f034e9a2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java @@ -64,7 +64,7 @@ import static org.keycloak.services.util.CookieHelper.LEGACY_COOKIE; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLoginUrlOf; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/LogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/LogoutTest.java index f84a438bf1..4162f6b960 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/LogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/LogoutTest.java @@ -57,7 +57,7 @@ import java.util.function.Consumer; import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.UriBuilderException; import javax.xml.transform.dom.DOMSource; -import javax.xml.ws.soap.SOAPFaultException; +import jakarta.xml.ws.soap.SOAPFaultException; import org.apache.http.HttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;