From 7cff8572387e6bbfca160aa60e9a8191d22e5c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Barto=C5=A1?= Date: Wed, 4 Jan 2023 16:16:10 +0100 Subject: [PATCH] Migrate packages from javax.* to jakarta.* --- Quarkus3 branch sync no. 14 (24.4.2023) Resolved conflicts: keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java - Modified keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/DeclarativeUserTest.java - Modified keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java - Modified keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java - Modified keycloak/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java - Modified --- Quarkus3 branch sync no. 13 (11.4.2023) Resolved conflicts: keycloak/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountTotpPage.java - Deleted keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java - Modified --- Quarkus3 branch sync no. 12 (31.3.2023) Resolved conflicts: keycloak/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/QuarkusWelcomeResource.java - Modified keycloak/services/src/main/java/org/keycloak/protocol/saml/profile/util/Soap.java - Modified keycloak/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UserInfoClientUtil.java - Modified keycloak/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java - Modified keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java - Modified --- Quarkus3 branch sync no. 10 (17.3.2023) Resolved conflicts: keycloak/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java - Modified --- Quarkus3 branch sync no. 9 (10.3.2023) Resolved conflicts: keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java - Modified keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java - Modified --- Quarkus3 branch sync no. 8 (3.3.2023) Resolved conflicts: keycloak/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java Modified - Modified keycloak/services/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java - Modified keycloak/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionAuthenticator.java - Modified --- Quarkus3 branch sync no. 6 (17.2.2023) Resolved conflicts: keycloak/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java - Modified keycloak/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java - Modified keycloak/services/src/main/java/org/keycloak/protocol/saml/installation/SamlSPDescriptorClientInstallation.java - Modified --- Quarkus3 branch sync no. 5 (10.2.2023) Resolved conflicts: /keycloak/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java Modified - Modified keycloak/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java - Modified --- Quarkus3 branch sync no. 4 (3.2.2023) Resolved conflicts: keycloak/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusKeycloakApplication.java - Modified --- Quarkus3 branch sync no. 1 (18.1.2023) Resolved conflicts: keycloak/testsuite/client/ClientPoliciesTest.java - Deleted keycloak/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java - Modified keycloak/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaModelCriteriaBuilder.java - Modified --- .../adapters/installed/KeycloakInstalled.java | 8 ++-- .../jaxrs/JaxrsBearerTokenFilter.java | 9 ++-- .../jaxrs/JaxrsBearerTokenFilterImpl.java | 12 ++--- .../org/keycloak/jaxrs/JaxrsHttpFacade.java | 18 ++++---- .../org/keycloak/jaxrs/JaxrsOAuthClient.java | 22 ++++----- .../jaxrs/OsgiJaxrsBearerTokenFilterImpl.java | 6 +-- .../AbstractKeycloakJettyAuthenticator.java | 8 ++-- .../jetty/core/JettyRequestAuthenticator.java | 2 +- .../jetty/core/JettySessionTokenStore.java | 2 +- .../jetty/core/OIDCJettyHttpFacade.java | 2 +- .../jetty/Jetty94RequestAuthenticator.java | 2 +- .../adapters/jetty/Jetty94SessionManager.java | 2 +- .../jetty/JettyAdapterSessionStore.java | 2 +- .../jetty/KeycloakJettyAuthenticator.java | 2 +- .../servlet/FilterRequestAuthenticator.java | 4 +- .../adapters/servlet/KeycloakOIDCFilter.java | 18 ++++---- .../servlet/OIDCFilterSessionStore.java | 6 +-- .../servlet/OIDCServletHttpFacade.java | 4 +- ...HttpHeaderInspectingApiRequestMatcher.java | 2 +- .../KeycloakAuthenticationEntryPoint.java | 6 +-- .../KeycloakAuthenticationFailureHandler.java | 6 +-- .../KeycloakAuthenticationSuccessHandler.java | 6 +-- .../KeycloakCookieBasedRedirect.java | 4 +- .../authentication/KeycloakLogoutHandler.java | 4 +- .../RequestAuthenticatorFactory.java | 2 +- .../SpringSecurityRequestAuthenticator.java | 4 +- ...ngSecurityRequestAuthenticatorFactory.java | 2 +- .../facade/SimpleHttpFacade.java | 4 +- .../facade/WrappedHttpServletRequest.java | 6 +-- .../facade/WrappedHttpServletResponse.java | 4 +- .../AdapterStateCookieRequestMatcher.java | 4 +- .../KeycloakAuthenticatedActionsFilter.java | 12 ++--- ...eycloakAuthenticationProcessingFilter.java | 8 ++-- .../filter/KeycloakCsrfRequestMatcher.java | 2 +- .../filter/KeycloakPreAuthActionsFilter.java | 12 ++--- .../KeycloakSecurityContextRequestFilter.java | 12 ++--- .../QueryParamPresenceRequestMatcher.java | 2 +- .../management/HttpSessionManager.java | 2 +- .../LocalSessionManagementStrategy.java | 2 +- .../management/SessionManagementStrategy.java | 2 +- .../token/AdapterTokenStoreFactory.java | 4 +- ...pringSecurityAdapterTokenStoreFactory.java | 4 +- .../token/SpringSecurityCookieTokenStore.java | 4 +- .../token/SpringSecurityTokenStore.java | 4 +- .../facade/WrappedHttpServletRequestTest.java | 2 +- .../WrappedHttpServletResponseTest.java | 2 +- ...oakAuthenticationProcessingFilterTest.java | 6 +-- .../KeycloakPreAuthActionsFilterTest.java | 6 +-- ...gSecurityAdapterTokenStoreFactoryTest.java | 4 +- .../AbstractAuthenticatedActionsValve.java | 2 +- .../AbstractKeycloakAuthenticatorValve.java | 6 +-- .../tomcat/CatalinaRequestAuthenticator.java | 2 +- .../tomcat/OIDCCatalinaHttpFacade.java | 2 +- .../tomcat/KeycloakAuthenticatorValve.java | 2 +- .../tomcat/TomcatRequestAuthenticator.java | 2 +- .../undertow/KeycloakServletExtension.java | 2 +- .../undertow/ServletKeycloakAuthMech.java | 8 ++-- .../undertow/ServletRequestAuthenticator.java | 4 +- .../undertow/ServletSessionTokenStore.java | 4 +- ...towNodesRegistrationManagementWrapper.java | 4 +- .../adapters/elytron/ElytronHttpFacade.java | 8 ++-- .../KeycloakConfigurationServletListener.java | 6 +-- .../elytron/KeycloakServletExtension.java | 4 +- .../profile/ecp/EcpAuthenticationHandler.java | 14 +++--- .../saml/jetty/AbstractSamlAuthenticator.java | 12 ++--- .../saml/jetty/JettySamlSessionStore.java | 2 +- .../saml/jetty/Jetty9SamlSessionStore.java | 2 +- .../saml/jetty/Jetty9SessionManager.java | 2 +- .../saml/jetty/JettyAdapterSessionStore.java | 2 +- .../saml/jetty/KeycloakSamlAuthenticator.java | 2 +- .../saml/servlet/FilterSamlSessionStore.java | 6 +-- .../adapters/saml/servlet/SamlFilter.java | 20 ++++---- .../saml/AbstractSamlAuthenticatorValve.java | 8 ++-- .../saml/CatalinaSamlSessionStore.java | 2 +- .../saml/IdMapperUpdaterSessionListener.java | 2 +- .../saml/tomcat/SamlAuthenticatorValve.java | 2 +- .../saml/undertow/SamlServletExtension.java | 2 +- .../saml/undertow/ServletSamlAuthMech.java | 8 ++-- .../undertow/ServletSamlSessionStore.java | 6 +-- .../IdMapperUpdaterSessionListener.java | 10 ++-- .../KeycloakConfigurationServletListener.java | 6 +-- ...loakHttpServerAuthenticationMechanism.java | 2 +- ...InfinispanSessionCacheIdMapperUpdater.java | 2 +- .../adapters/jetty/spi/JettyHttpFacade.java | 8 ++-- .../jetty/spi/JettySessionManager.java | 2 +- .../jetty/spi/JettyUserSessionManagement.java | 2 +- .../adapters/servlet/FilterSessionStore.java | 10 ++-- .../adapters/servlet/ServletHttpFacade.java | 8 ++-- .../adapters/tomcat/CatalinaHttpFacade.java | 6 +-- .../adapters/undertow/SavedRequest.java | 2 +- .../adapters/undertow/ServletHttpFacade.java | 4 +- .../adapters/undertow/UndertowHttpFacade.java | 8 ++-- .../keycloak/common/util/MimeTypeUtil.java | 2 +- .../kerberos/GSSCredentialsClient.java | 2 +- .../example/ldap/LDAPPictureServlet.java | 10 ++-- .../SecretQuestionAuthenticator.java | 6 +-- .../SecretQuestionRequiredAction.java | 2 +- .../examples/domainextension/jpa/Company.java | 12 ++--- .../domainextension/rest/CompanyResource.java | 16 +++---- .../rest/ExampleRestResource.java | 6 +-- .../spi/impl/ExampleServiceImpl.java | 2 +- .../examples/rest/HelloResourceProvider.java | 4 +- .../admin/LdapServerCapabilitiesResource.java | 14 +++--- .../admin/TestLdapConnectionResource.java | 10 ++-- .../admin/client/ClientBuilderWrapper.java | 2 +- .../admin/client/CreatedResponseUtil.java | 4 +- .../org/keycloak/admin/client/Keycloak.java | 4 +- .../admin/client/KeycloakBuilder.java | 6 +-- .../resource/AggregatePoliciesResource.java | 18 ++++---- .../resource/AggregatePolicyResource.java | 14 +++--- .../resource/AttackDetectionResource.java | 12 ++--- .../AuthenticationManagementResource.java | 20 ++++---- .../resource/AuthorizationResource.java | 16 +++---- .../client/resource/BasicAuthFilter.java | 6 +-- .../client/resource/BearerAuthFilter.java | 10 ++-- .../ClientAttributeCertificateResource.java | 12 ++--- .../resource/ClientInitialAccessResource.java | 16 +++---- .../ClientPoliciesPoliciesResource.java | 10 ++-- .../ClientPoliciesProfilesResource.java | 12 ++--- .../resource/ClientPoliciesResource.java | 18 ++++---- .../client/resource/ClientPolicyResource.java | 14 +++--- .../ClientRegistrationPolicyResource.java | 8 ++-- .../admin/client/resource/ClientResource.java | 20 ++++---- .../resource/ClientScopePoliciesResource.java | 16 +++---- .../client/resource/ClientScopeResource.java | 14 +++--- .../client/resource/ClientScopesResource.java | 16 +++---- .../client/resource/ClientsResource.java | 18 ++++---- .../client/resource/ComponentResource.java | 16 +++---- .../client/resource/ComponentsResource.java | 20 ++++---- .../resource/GroupPoliciesResource.java | 18 ++++---- .../client/resource/GroupPolicyResource.java | 14 +++--- .../admin/client/resource/GroupResource.java | 20 ++++---- .../admin/client/resource/GroupsResource.java | 6 +-- .../resource/IdentityProviderResource.java | 22 ++++----- .../resource/IdentityProvidersResource.java | 16 +++---- .../client/resource/JSPoliciesResource.java | 18 ++++---- .../client/resource/JSPolicyResource.java | 14 +++--- .../admin/client/resource/KeyResource.java | 6 +-- .../client/resource/PermissionsResource.java | 2 +- .../client/resource/PoliciesResource.java | 18 ++++---- .../admin/client/resource/PolicyResource.java | 16 +++---- .../resource/ProtocolMappersResource.java | 18 ++++---- .../resource/RealmLocalizationResource.java | 20 ++++---- .../admin/client/resource/RealmResource.java | 26 +++++------ .../admin/client/resource/RealmsResource.java | 14 +++--- .../resource/RegexPoliciesResource.java | 10 ++-- .../resource/ResourcePermissionResource.java | 14 +++--- .../resource/ResourcePermissionsResource.java | 18 ++++---- .../client/resource/ResourceResource.java | 14 +++--- .../resource/ResourceScopeResource.java | 14 +++--- .../resource/ResourceScopesResource.java | 18 ++++---- .../client/resource/ResourcesResource.java | 18 ++++---- .../client/resource/RoleByIdResource.java | 20 ++++---- .../client/resource/RoleMappingResource.java | 12 ++--- .../client/resource/RolePoliciesResource.java | 18 ++++---- .../client/resource/RolePolicyResource.java | 14 +++--- .../admin/client/resource/RoleResource.java | 20 ++++---- .../client/resource/RoleScopeResource.java | 18 ++++---- .../admin/client/resource/RolesResource.java | 20 ++++---- .../resource/ScopePermissionResource.java | 14 +++--- .../resource/ScopePermissionsResource.java | 18 ++++---- .../client/resource/ServerInfoResource.java | 8 ++-- .../client/resource/TimePoliciesResource.java | 18 ++++---- .../client/resource/TimePolicyResource.java | 14 +++--- .../client/resource/UserPoliciesResource.java | 18 ++++---- .../client/resource/UserPolicyResource.java | 14 +++--- .../client/resource/UserProfileResource.java | 12 ++--- .../admin/client/resource/UserResource.java | 26 +++++------ .../resource/UserStorageProviderResource.java | 12 ++--- .../admin/client/resource/UsersResource.java | 20 ++++---- .../spi/ResteasyClientClassicProvider.java | 6 +-- .../client/spi/ResteasyClientProvider.java | 6 +-- .../admin/client/token/TokenManager.java | 8 ++-- .../admin/client/token/TokenService.java | 14 +++--- .../org/keycloak/test/FluentTestsHelper.java | 4 +- .../java/org/keycloak/test/TestsHelper.java | 4 +- .../ConcurrencyVersioningTest.java | 6 +-- .../jpa/entities/PermissionTicketEntity.java | 24 +++++----- .../jpa/entities/PolicyEntity.java | 34 +++++++------- .../jpa/entities/ResourceAttributeEntity.java | 22 ++++----- .../jpa/entities/ResourceEntity.java | 36 +++++++-------- .../jpa/entities/ResourceServerEntity.java | 8 ++-- .../jpa/entities/ScopeEntity.java | 28 +++++------ .../store/JPAAuthorizationStoreFactory.java | 2 +- .../jpa/store/JPAPermissionTicketStore.java | 16 +++---- .../jpa/store/JPAPolicyStore.java | 18 ++++---- .../jpa/store/JPAResourceServerStore.java | 4 +- .../jpa/store/JPAResourceStore.java | 18 ++++---- .../jpa/store/JPAScopeStore.java | 18 ++++---- .../jpa/store/JPAStoreFactory.java | 2 +- .../jpa/store/PermissionTicketAdapter.java | 2 +- .../jpa/store/PolicyAdapter.java | 2 +- .../jpa/store/ResourceAdapter.java | 4 +- .../jpa/store/ResourceServerAdapter.java | 2 +- .../authorization/jpa/store/ScopeAdapter.java | 2 +- .../jpa/DefaultJpaConnectionProvider.java | 2 +- .../DefaultJpaConnectionProviderFactory.java | 10 ++-- .../jpa/HibernateStatsReporter.java | 2 +- .../jpa/JndiEntityManagerLookup.java | 4 +- .../jpa/JpaConnectionProvider.java | 2 +- .../jpa/JpaExceptionConverter.java | 2 +- .../jpa/JpaKeycloakTransaction.java | 4 +- .../jpa/PersistenceExceptionConverter.java | 4 +- .../connections/jpa/util/JpaUtils.java | 6 +-- .../keycloak/events/jpa/AdminEventEntity.java | 8 ++-- .../org/keycloak/events/jpa/EventEntity.java | 8 ++-- .../events/jpa/JpaAdminEventQuery.java | 14 +++--- .../keycloak/events/jpa/JpaEventQuery.java | 12 ++--- .../events/jpa/JpaEventStoreProvider.java | 4 +- .../keycloak/models/jpa/ClientAdapter.java | 2 +- .../models/jpa/ClientScopeAdapter.java | 2 +- .../org/keycloak/models/jpa/GroupAdapter.java | 6 +-- .../models/jpa/JpaClientProviderFactory.java | 2 +- .../jpa/JpaClientScopeProviderFactory.java | 2 +- .../JpaDeploymentStateProviderFactory.java | 2 +- .../models/jpa/JpaGroupProviderFactory.java | 2 +- .../keycloak/models/jpa/JpaRealmProvider.java | 18 ++++---- .../models/jpa/JpaRealmProviderFactory.java | 2 +- .../models/jpa/JpaRoleProviderFactory.java | 2 +- .../models/jpa/JpaUserCredentialStore.java | 6 +-- .../jpa/JpaUserCredentialStoreFactory.java | 2 +- .../keycloak/models/jpa/JpaUserProvider.java | 24 +++++----- .../models/jpa/JpaUserProviderFactory.java | 2 +- .../models/jpa/MigrationModelAdapter.java | 4 +- .../keycloak/models/jpa/PaginationUtils.java | 2 +- .../jpa/PersistenceExceptionConverter.java | 4 +- .../org/keycloak/models/jpa/RealmAdapter.java | 6 +-- .../org/keycloak/models/jpa/RoleAdapter.java | 4 +- .../org/keycloak/models/jpa/UserAdapter.java | 16 +++---- .../jpa/converter/MapStringConverter.java | 2 +- .../AuthenticationExecutionEntity.java | 22 ++++----- .../entities/AuthenticationFlowEntity.java | 22 ++++----- .../entities/AuthenticatorConfigEntity.java | 26 +++++------ .../jpa/entities/ClientAttributeEntity.java | 16 +++---- .../models/jpa/entities/ClientEntity.java | 30 ++++++------ .../entities/ClientInitialAccessEntity.java | 22 ++++----- .../entities/ClientScopeAttributeEntity.java | 16 +++---- .../ClientScopeClientMappingEntity.java | 14 +++--- .../jpa/entities/ClientScopeEntity.java | 28 +++++------ .../ClientScopeRoleMappingEntity.java | 18 ++++---- .../jpa/entities/ComponentConfigEntity.java | 18 ++++---- .../models/jpa/entities/ComponentEntity.java | 22 ++++----- .../models/jpa/entities/CredentialEntity.java | 28 +++++------ .../DefaultClientScopeRealmMappingEntity.java | 20 ++++---- .../jpa/entities/FederatedIdentityEntity.java | 20 ++++---- .../jpa/entities/GroupAttributeEntity.java | 22 ++++----- .../models/jpa/entities/GroupEntity.java | 2 +- .../jpa/entities/GroupRoleMappingEntity.java | 20 ++++---- .../jpa/entities/IdentityProviderEntity.java | 28 +++++------ .../IdentityProviderMapperEntity.java | 24 +++++----- .../jpa/entities/MigrationModelEntity.java | 16 +++---- .../jpa/entities/ProtocolMapperEntity.java | 24 +++++----- .../jpa/entities/RealmAttributeEntity.java | 20 ++++---- .../models/jpa/entities/RealmEntity.java | 32 ++++++------- .../RealmLocalizationTextsEntity.java | 12 ++--- .../RequiredActionProviderEntity.java | 28 +++++------ .../entities/RequiredCredentialEntity.java | 16 +++---- .../jpa/entities/RoleAttributeEntity.java | 22 ++++----- .../models/jpa/entities/RoleEntity.java | 30 ++++++------ .../jpa/entities/UserAttributeEntity.java | 22 ++++----- .../UserConsentClientScopeEntity.java | 20 ++++---- .../jpa/entities/UserConsentEntity.java | 28 +++++------ .../models/jpa/entities/UserEntity.java | 22 ++++----- .../entities/UserFederationMapperEntity.java | 24 +++++----- .../UserFederationProviderEntity.java | 24 +++++----- .../entities/UserGroupMembershipEntity.java | 20 ++++---- .../entities/UserRequiredActionEntity.java | 20 ++++---- .../jpa/entities/UserRoleMappingEntity.java | 20 ++++---- .../JpaUserSessionPersisterProvider.java | 8 ++-- ...paUserSessionPersisterProviderFactory.java | 2 +- .../PersistentClientSessionEntity.java | 14 +++--- .../session/PersistentUserSessionEntity.java | 14 +++--- .../jpa/JpaUserFederatedStorageProvider.java | 6 +-- ...paUserFederatedStorageProviderFactory.java | 2 +- .../storage/jpa/entity/BrokerLinkEntity.java | 14 +++--- .../storage/jpa/entity/FederatedUser.java | 16 +++---- .../entity/FederatedUserAttributeEntity.java | 16 +++---- ...FederatedUserConsentClientScopeEntity.java | 20 ++++---- .../entity/FederatedUserConsentEntity.java | 22 ++++----- .../entity/FederatedUserCredentialEntity.java | 24 +++++----- .../FederatedUserGroupMembershipEntity.java | 14 +++--- .../FederatedUserRequiredActionEntity.java | 14 +++--- .../FederatedUserRoleMappingEntity.java | 14 +++--- .../datastore/LegacyExportImportManager.java | 2 +- .../admin/ClearKeysCacheResource.java | 4 +- .../admin/ClearRealmCacheResource.java | 2 +- .../admin/ClearUserCacheResource.java | 2 +- .../admin/ClientStorageProviderResource.java | 14 +++--- .../admin/UserStorageProviderResource.java | 20 ++++---- .../map/storage/jpa/JpaAttributeEntity.java | 14 +++--- .../models/map/storage/jpa/JpaMapStorage.java | 23 +++++----- .../storage/jpa/JpaMapStorageProvider.java | 2 +- .../jpa/JpaMapStorageProviderFactory.java | 20 ++++---- .../models/map/storage/jpa/JpaMapUtils.java | 4 +- .../storage/jpa/JpaModelCriteriaBuilder.java | 6 +-- .../map/storage/jpa/JpaPredicateFunction.java | 6 +-- .../map/storage/jpa/JpaSubqueryProvider.java | 6 +-- .../storage/jpa/JpaTransactionWrapper.java | 4 +- .../map/storage/jpa/PaginationUtils.java | 2 +- .../jpa/PersistenceExceptionConverter.java | 4 +- ...paRootAuthenticationSessionMapStorage.java | 10 ++-- ...AuthenticationSessionDelegateProvider.java | 2 +- .../JpaAuthenticationSessionEntity.java | 20 ++++---- .../JpaRootAuthenticationSessionEntity.java | 18 ++++---- .../permission/JpaPermissionMapStorage.java | 8 ++-- .../JpaPermissionModelCriteriaBuilder.java | 2 +- .../JpaPermissionDelegateProvider.java | 2 +- .../entity/JpaPermissionEntity.java | 16 +++---- .../policy/JpaPolicyMapStorage.java | 8 ++-- .../policy/JpaPolicyModelCriteriaBuilder.java | 6 +-- .../delegate/JpaPolicyDelegateProvider.java | 10 ++-- .../policy/entity/JpaPolicyConfigEntity.java | 4 +- .../policy/entity/JpaPolicyEntity.java | 26 +++++------ .../resource/JpaResourceMapStorage.java | 8 ++-- .../JpaResourceModelCriteriaBuilder.java | 4 +- .../delegate/JpaResourceDelegateProvider.java | 10 ++-- .../entity/JpaResourceAttributeEntity.java | 4 +- .../resource/entity/JpaResourceEntity.java | 26 +++++------ .../JpaResourceServerMapStorage.java | 8 ++-- .../JpaResourceServerDelegateProvider.java | 2 +- .../entity/JpaResourceServerEntity.java | 16 +++---- .../scope/JpaScopeMapStorage.java | 8 ++-- .../scope/JpaScopeModelCriteriaBuilder.java | 2 +- .../delagate/JpaScopeDelegateProvider.java | 2 +- .../scope/entity/JpaScopeEntity.java | 16 +++---- .../jpa/client/JpaClientMapStorage.java | 8 ++-- .../client/JpaClientModelCriteriaBuilder.java | 4 +- .../delegate/JpaClientDelegateProvider.java | 10 ++-- .../entity/JpaClientAttributeEntity.java | 6 +-- .../jpa/client/entity/JpaClientEntity.java | 20 ++++---- .../clientScope/JpaClientScopeMapStorage.java | 8 ++-- .../JpaClientScopeDelegateProvider.java | 10 ++-- .../entity/JpaClientScopeAttributeEntity.java | 6 +-- .../entity/JpaClientScopeEntity.java | 20 ++++---- .../event/admin/JpaAdminEventMapStorage.java | 8 ++-- .../JpaAdminEventModelCriteriaBuilder.java | 2 +- .../admin/entity/JpaAdminEventEntity.java | 14 +++--- .../event/auth/JpaAuthEventMapStorage.java | 8 ++-- .../JpaAuthEventModelCriteriaBuilder.java | 2 +- .../auth/entity/JpaAuthEventDetailEntity.java | 6 +-- .../event/auth/entity/JpaAuthEventEntity.java | 18 ++++---- .../storage/jpa/group/JpaGroupMapStorage.java | 8 ++-- .../group/JpaGroupModelCriteriaBuilder.java | 6 +-- .../delegate/JpaGroupDelegateProvider.java | 10 ++-- .../group/entity/JpaGroupAttributeEntity.java | 6 +-- .../jpa/group/entity/JpaGroupEntity.java | 20 ++++---- .../hibernate/JpaMapExceptionConverter.java | 2 +- .../JpaOptimisticLockingListener.java | 4 +- .../JpaUserLoginFailureMapStorage.java | 8 ++-- .../JpaUserLoginFailureDelegateProvider.java | 2 +- .../entity/JpaUserLoginFailureEntity.java | 16 +++---- .../storage/jpa/realm/JpaRealmMapStorage.java | 8 ++-- .../realm/JpaRealmModelCriteriaBuilder.java | 2 +- .../delegate/JpaRealmDelegateProvider.java | 10 ++-- .../jpa/realm/entity/JpaComponentEntity.java | 20 ++++---- .../realm/entity/JpaRealmAttributeEntity.java | 6 +-- .../jpa/realm/entity/JpaRealmEntity.java | 20 ++++---- .../storage/jpa/role/JpaRoleMapStorage.java | 8 ++-- .../jpa/role/JpaRoleModelCriteriaBuilder.java | 6 +-- .../delegate/JpaMapRoleEntityDelegate.java | 6 +-- .../delegate/JpaRoleDelegateProvider.java | 10 ++-- .../role/entity/JpaRoleAttributeEntity.java | 6 +-- .../role/entity/JpaRoleCompositeEntity.java | 14 +++--- .../entity/JpaRoleCompositeEntityKey.java | 4 +- .../jpa/role/entity/JpaRoleEntity.java | 20 ++++---- .../JpaSingleUseObjectMapStorage.java | 8 ++-- .../entity/JpaSingleUseObjectEntity.java | 18 ++++---- .../entity/JpaSingleUseObjectNoteEntity.java | 6 +-- .../storage/jpa/user/JpaUserMapStorage.java | 8 ++-- .../jpa/user/JpaUserModelCriteriaBuilder.java | 6 +-- .../delegate/JpaUserDelegateProvider.java | 10 ++-- .../user/entity/JpaUserAttributeEntity.java | 6 +-- .../jpa/user/entity/JpaUserConsentEntity.java | 20 ++++---- .../jpa/user/entity/JpaUserEntity.java | 26 +++++------ .../JpaUserFederatedIdentityEntity.java | 18 ++++---- .../userSession/JpaUserSessionMapStorage.java | 8 ++-- .../JpaUserSessionModelCriteriaBuilder.java | 4 +- .../entity/JpaClientSessionEntity.java | 22 ++++----- .../entity/JpaClientSessionNoteEntity.java | 4 +- .../entity/JpaUserSessionEntity.java | 18 ++++---- .../entity/JpaUserSessionNoteEntity.java | 4 +- .../quarkus/deployment/CacheBuildSteps.java | 2 +- .../quarkus/deployment/KeycloakProcessor.java | 4 +- .../KeycloakNegativeHealthCheckTest.java | 2 +- .../quarkus/runtime/KeycloakMain.java | 2 +- .../hostname/DefaultHostnameProvider.java | 2 +- .../integration/QuarkusHttpRequest.java | 4 +- .../integration/QuarkusLifecycleObserver.java | 4 +- .../ClientConnectionContextInjector.java | 2 +- .../jaxrs/KeycloakContextInjector.java | 2 +- .../jaxrs/QuarkusKeycloakApplication.java | 2 +- .../jaxrs/TransactionalResponseFilter.java | 15 +++--- .../TransactionalResponseInterceptor.java | 15 +++--- .../integration/web/QuarkusRequestFilter.java | 2 +- .../health/KeycloakReadyHealthCheck.java | 4 +- .../resources/QuarkusWelcomeResource.java | 30 ++++++------ .../AbstractJpaConnectionProviderFactory.java | 10 ++-- .../NamedJpaConnectionProviderFactory.java | 2 +- .../QuarkusJpaMapStorageProviderFactory.java | 6 +-- .../LegacyJpaConnectionProviderFactory.java | 6 +-- .../QuarkusJtaTransactionManagerLookup.java | 4 +- .../provider/legacy/jpa/entity/Realm.java | 4 +- .../legacy/jpa/user/MyUserProvider.java | 2 +- .../jpa/user/MyUserProviderFactory.java | 2 +- .../dom/saml/v2/ac/ActivationLimitType.java | 8 ++-- .../saml/v2/ac/ActivationLimitUsagesType.java | 8 ++-- .../dom/saml/v2/ac/ActivationPinType.java | 8 ++-- .../keycloak/dom/saml/v2/ac/AlphabetType.java | 8 ++-- .../dom/saml/v2/ac/AuthenticatorBaseType.java | 12 ++--- .../AuthenticatorTransportProtocolType.java | 8 ++-- .../ac/AuthnContextDeclarationBaseType.java | 18 ++++---- .../dom/saml/v2/ac/AuthnMethodBaseType.java | 8 ++-- .../keycloak/dom/saml/v2/ac/BooleanType.java | 6 +-- .../saml/v2/ac/ComplexAuthenticatorType.java | 12 ++--- .../dom/saml/v2/ac/DeviceTypeType.java | 6 +-- .../dom/saml/v2/ac/ExtensionOnlyType.java | 8 ++-- .../dom/saml/v2/ac/ExtensionType.java | 8 ++-- .../keycloak/dom/saml/v2/ac/Generation.java | 14 +++--- .../saml/v2/ac/GoverningAgreementRefType.java | 10 ++-- .../saml/v2/ac/GoverningAgreementsType.java | 8 ++-- .../dom/saml/v2/ac/IdentificationType.java | 10 ++-- .../dom/saml/v2/ac/KeyActivationType.java | 8 ++-- .../dom/saml/v2/ac/KeySharingType.java | 8 ++-- .../dom/saml/v2/ac/KeyStorageType.java | 8 ++-- .../keycloak/dom/saml/v2/ac/LengthType.java | 10 ++-- .../keycloak/dom/saml/v2/ac/MediumType.java | 6 +-- .../org/keycloak/dom/saml/v2/ac/NymType.java | 6 +-- .../saml/v2/ac/OperationalProtectionType.java | 8 ++-- .../keycloak/dom/saml/v2/ac/PasswordType.java | 14 +++--- .../dom/saml/v2/ac/PhysicalVerification.java | 14 +++--- .../PrincipalAuthenticationMechanismType.java | 10 ++-- .../saml/v2/ac/PrivateKeyProtectionType.java | 8 ++-- .../dom/saml/v2/ac/PublicKeyType.java | 12 ++--- .../dom/saml/v2/ac/RestrictedLengthType.java | 6 +-- .../saml/v2/ac/RestrictedPasswordType.java | 6 +-- .../saml/v2/ac/SecretKeyProtectionType.java | 8 ++-- .../dom/saml/v2/ac/SecurityAuditType.java | 8 ++-- .../ac/SharedSecretChallengeResponseType.java | 12 ++--- .../v2/ac/TechnicalProtectionBaseType.java | 8 ++-- .../dom/saml/v2/ac/TimeSyncTokenType.java | 8 ++-- .../keycloak/dom/saml/v2/ac/TokenType.java | 8 ++-- .../saml/common/DefaultPicketLinkLogger.java | 3 +- .../saml/common/PicketLinkLogger.java | 2 +- .../saml/common/util/TransformerUtil.java | 6 +-- .../core/saml/v2/util/SignatureUtil.java | 2 +- .../saml/processing/core/util/JAXBUtil.java | 8 ++-- .../core/util/XMLSignatureUtil.java | 2 +- .../AbstractAuthenticationFlowContext.java | 4 +- .../authentication/AuthenticationFlow.java | 2 +- .../AuthenticationFlowException.java | 2 +- .../authentication/FormAuthenticator.java | 2 +- .../keycloak/authentication/FormContext.java | 2 +- .../authentication/RequiredActionContext.java | 4 +- .../authentication/ValidationContext.java | 2 +- .../provider/AbstractIdentityProvider.java | 6 +-- .../provider/AuthenticationRequest.java | 2 +- .../provider/ExchangeExternalToken.java | 2 +- .../ExchangeTokenToIdentityProviderToken.java | 6 +-- .../broker/provider/IdentityProvider.java | 6 +-- .../device/DeviceActivityManager.java | 2 +- .../forms/account/AccountProvider.java | 8 ++-- .../forms/login/LoginFormsProvider.java | 4 +- .../headers/SecurityHeadersProvider.java | 4 +- .../models/OAuth2DeviceCodeModel.java | 4 +- .../models/utils/KeycloakModelUtils.java | 6 +-- .../protocol/ClientInstallationProvider.java | 2 +- .../org/keycloak/protocol/LoginProtocol.java | 6 +-- .../protocol/oidc/TokenExchangeContext.java | 4 +- .../protocol/oidc/TokenExchangeProvider.java | 2 +- .../oidc/TokenIntrospectionProvider.java | 2 +- .../JtaTransactionManagerLookup.java | 2 +- .../userprofile/ValidationException.java | 2 +- .../keycloak/utils/ReservedCharValidator.java | 2 +- .../keycloak/validate/ValidationError.java | 2 +- .../keycloak/validation/ValidationUtil.java | 2 +- .../java/org/keycloak/http/HttpRequest.java | 6 +-- .../org/keycloak/models/KeycloakContext.java | 2 +- .../org/keycloak/models/KeycloakUriInfo.java | 8 ++-- .../clientpolicy/ClientPolicyException.java | 4 +- .../org/keycloak/urls/HostnameProvider.java | 2 +- .../AuthenticationProcessor.java | 8 ++-- .../ClientAuthenticationFlow.java | 2 +- .../DefaultAuthenticationFlow.java | 6 +-- .../FormAuthenticationFlow.java | 6 +-- .../RequiredActionContextResult.java | 6 +-- .../actiontoken/ActionTokenContext.java | 6 +-- .../actiontoken/ActionTokenHandler.java | 2 +- .../actiontoken/DefaultActionToken.java | 2 +- .../ExecuteActionsActionTokenHandler.java | 6 +-- ...dpVerifyAccountLinkActionTokenHandler.java | 6 +-- .../ResetCredentialsActionTokenHandler.java | 2 +- .../UpdateEmailActionTokenHandler.java | 2 +- .../VerifyEmailActionTokenHandler.java | 6 +-- .../access/DenyAccessAuthenticator.java | 2 +- .../broker/AbstractIdpAuthenticator.java | 2 +- .../broker/IdpConfirmLinkAuthenticator.java | 4 +- .../IdpCreateUserIfUniqueAuthenticator.java | 2 +- ...DetectExistingBrokerUserAuthenticator.java | 2 +- .../IdpEmailVerificationAuthenticator.java | 6 +-- .../broker/IdpReviewProfileAuthenticator.java | 4 +- .../broker/IdpUsernamePasswordForm.java | 4 +- .../AbstractUsernameFormAuthenticator.java | 4 +- .../ConditionalOtpFormAuthenticator.java | 2 +- .../IdentityProviderAuthenticator.java | 4 +- .../browser/OTPFormAuthenticator.java | 4 +- .../authenticators/browser/PasswordForm.java | 4 +- .../RecoveryAuthnCodesFormAuthenticator.java | 4 +- .../browser/SpnegoAuthenticator.java | 6 +-- .../authenticators/browser/UsernameForm.java | 4 +- .../browser/UsernamePasswordForm.java | 4 +- .../browser/WebAuthnAuthenticator.java | 4 +- .../challenge/BasicAuthAuthenticator.java | 8 ++-- .../challenge/BasicAuthOTPAuthenticator.java | 2 +- .../NoCookieFlowRedirectAuthenticator.java | 6 +-- .../client/AbstractClientAuthenticator.java | 2 +- .../authenticators/client/ClientAuthUtil.java | 4 +- .../ClientIdAndSecretAuthenticator.java | 8 ++-- .../client/JWTClientAuthenticator.java | 4 +- .../client/JWTClientSecretAuthenticator.java | 4 +- .../client/X509ClientAuthenticator.java | 6 +-- .../AbstractDirectGrantAuthenticator.java | 4 +- .../directgrant/ValidateOTP.java | 4 +- .../directgrant/ValidatePassword.java | 4 +- .../directgrant/ValidateUsername.java | 4 +- .../resetcred/ResetCredentialChooseUser.java | 4 +- .../resetcred/ResetCredentialEmail.java | 4 +- .../UserSessionLimitsAuthenticator.java | 4 +- ...actX509ClientCertificateAuthenticator.java | 2 +- ...ntCertificateDirectGrantAuthenticator.java | 4 +- .../x509/ValidateX509CertificateUsername.java | 2 +- .../X509ClientCertificateAuthenticator.java | 6 +-- .../forms/RegistrationPage.java | 2 +- .../forms/RegistrationPassword.java | 2 +- .../forms/RegistrationProfile.java | 2 +- .../forms/RegistrationRecaptcha.java | 2 +- .../forms/RegistrationUserCreation.java | 2 +- .../RecoveryAuthnCodesAction.java | 4 +- .../requiredactions/TermsAndConditions.java | 2 +- .../requiredactions/UpdateEmail.java | 6 +-- .../requiredactions/UpdatePassword.java | 4 +- .../requiredactions/UpdateProfile.java | 4 +- .../requiredactions/UpdateTotp.java | 4 +- .../requiredactions/VerifyEmail.java | 2 +- .../requiredactions/VerifyUserProfile.java | 6 +-- .../requiredactions/WebAuthnRegister.java | 6 +-- .../authorization/AuthorizationService.java | 2 +- .../admin/AuthorizationService.java | 4 +- .../admin/PolicyEvaluationService.java | 10 ++-- .../admin/PolicyResourceService.java | 18 ++++---- .../authorization/admin/PolicyService.java | 22 ++++----- .../admin/PolicyTypeService.java | 2 +- .../admin/ResourceServerService.java | 18 ++++---- .../admin/ResourceSetService.java | 22 ++++----- .../authorization/admin/ScopeService.java | 24 +++++----- .../AuthorizationTokenService.java | 8 ++-- .../common/KeycloakIdentity.java | 2 +- .../config/UmaConfiguration.java | 4 +- .../protection/ProtectionService.java | 4 +- .../introspect/RPTIntrospectionProvider.java | 4 +- .../permission/AbstractPermissionService.java | 2 +- .../permission/PermissionService.java | 8 ++-- .../permission/PermissionTicketService.java | 20 ++++---- .../policy/UserManagedPermissionService.java | 22 ++++----- .../protection/resource/ResourceService.java | 22 ++++----- .../oidc/AbstractOAuth2IdentityProvider.java | 18 ++++---- .../oidc/KeycloakOIDCIdentityProvider.java | 8 ++-- .../broker/oidc/OIDCIdentityProvider.java | 18 ++++---- .../keycloak/broker/saml/SAMLEndpoint.java | 28 +++++------ .../broker/saml/SAMLIdentityProvider.java | 8 ++-- .../common/util/ResponseSessionTask.java | 4 +- .../email/DefaultEmailSenderProvider.java | 18 ++++---- .../JBossLoggingEventListenerProvider.java | 6 +-- .../freemarker/FreeMarkerAccountProvider.java | 12 ++--- .../account/freemarker/model/AccountBean.java | 2 +- .../freemarker/model/AuthorizationBean.java | 2 +- .../account/freemarker/model/TotpBean.java | 2 +- .../FreeMarkerLoginFormsProvider.java | 10 ++-- .../model/AbstractUserProfileBean.java | 2 +- .../login/freemarker/model/EmailBean.java | 2 +- .../model/IdpReviewProfileBean.java | 2 +- .../login/freemarker/model/LoginBean.java | 2 +- .../login/freemarker/model/ProfileBean.java | 2 +- .../login/freemarker/model/RegisterBean.java | 2 +- .../freemarker/model/SAMLPostFormBean.java | 2 +- .../login/freemarker/model/TotpBean.java | 2 +- .../freemarker/model/VerifyProfileBean.java | 2 +- .../freemarker/model/X509ConfirmBean.java | 2 +- .../DefaultSecurityHeadersProvider.java | 10 ++-- .../locale/DefaultLocaleSelectorProvider.java | 4 +- .../locale/DefaultLocaleUpdaterProvider.java | 2 +- .../partialimport/AbstractPartialImport.java | 2 +- .../ClientRolesPartialImport.java | 2 +- .../partialimport/ErrorResponseException.java | 2 +- .../partialimport/RolesPartialImport.java | 2 +- .../protocol/AuthorizationEndpointBase.java | 4 +- .../keycloak/protocol/RestartLoginCookie.java | 4 +- .../protocol/docker/DockerAuthV2Protocol.java | 8 ++-- .../protocol/docker/DockerAuthenticator.java | 6 +-- .../protocol/docker/DockerEndpoint.java | 6 +-- .../docker/DockerV2LoginProtocolService.java | 6 +-- ...DockerComposeYamlInstallationProvider.java | 2 +- ...egistryConfigFileInstallationProvider.java | 4 +- ...rVariableOverrideInstallationProvider.java | 4 +- .../AccessTokenIntrospectionProvider.java | 4 +- .../oidc/DefaultTokenExchangeProvider.java | 8 ++-- .../oidc/FrontChannelLogoutHandler.java | 4 +- .../protocol/oidc/OIDCLoginProtocol.java | 8 ++-- .../oidc/OIDCLoginProtocolService.java | 24 +++++----- .../protocol/oidc/OIDCWellKnownProvider.java | 4 +- .../keycloak/protocol/oidc/TokenManager.java | 6 +-- .../oidc/endpoints/AuthorizationEndpoint.java | 14 +++--- .../AuthorizationEndpointChecker.java | 4 +- .../protocol/oidc/endpoints/IframeUtil.java | 4 +- .../endpoints/LoginStatusIframeEndpoint.java | 12 ++--- .../oidc/endpoints/LogoutEndpoint.java | 20 ++++---- .../ThirdPartyCookiesIframeEndpoint.java | 10 ++-- .../oidc/endpoints/TokenEndpoint.java | 22 ++++----- .../endpoints/TokenIntrospectionEndpoint.java | 12 ++--- .../endpoints/TokenRevocationEndpoint.java | 14 +++--- .../oidc/endpoints/UserInfoEndpoint.java | 16 +++---- ...izationEndpointRequestParserProcessor.java | 4 +- .../AuthzEndpointQueryStringParser.java | 2 +- .../oidc/grants/ciba/CibaGrantType.java | 6 +-- .../HttpAuthenticationChannelProvider.java | 8 ++-- ...ckchannelAuthenticationRequestContext.java | 2 +- .../BackchannelTokenRequestContext.java | 2 +- .../BackchannelTokenResponseContext.java | 2 +- .../SecureCibaSessionEnforceExecutor.java | 2 +- ...baSignedAuthenticationRequestExecutor.java | 2 +- .../ciba/endpoints/AbstractCibaEndpoint.java | 2 +- ...channelAuthenticationCallbackEndpoint.java | 14 +++--- .../BackchannelAuthenticationEndpoint.java | 14 +++--- .../ciba/endpoints/CibaRootEndpoint.java | 2 +- ...thenticationEndpointRequestBodyParser.java | 2 +- ...icationEndpointRequestParserProcessor.java | 4 +- .../oidc/grants/device/DeviceGrantType.java | 8 ++-- .../DeviceAuthorizationRequestContext.java | 2 +- .../context/DeviceTokenRequestContext.java | 2 +- .../context/DeviceTokenResponseContext.java | 2 +- .../device/endpoints/DeviceEndpoint.java | 20 ++++---- .../KeycloakOIDCClientInstallation.java | 4 +- ...DCJbossSubsystemClientCliInstallation.java | 4 +- ...kOIDCJbossSubsystemClientInstallation.java | 4 +- .../PushedAuthorizationRequestContext.java | 2 +- .../par/endpoints/AbstractParEndpoint.java | 2 +- .../oidc/par/endpoints/ParEndpoint.java | 14 +++--- .../oidc/par/endpoints/ParRootEndpoint.java | 2 +- .../ParEndpointRequestParserProcessor.java | 4 +- .../oidc/utils/AuthorizeClientUtil.java | 4 +- .../protocol/oidc/utils/LogoutUtil.java | 4 +- .../oidc/utils/OIDCRedirectUriBuilder.java | 4 +- .../protocol/oidc/utils/PkceUtils.java | 2 +- .../OpenShiftTokenReviewEndpoint.java | 14 +++--- .../saml/JaxrsSAML2BindingBuilder.java | 8 ++-- .../keycloak/protocol/saml/SamlProtocol.java | 14 +++--- .../protocol/saml/SamlProtocolUtils.java | 4 +- .../keycloak/protocol/saml/SamlService.java | 26 +++++------ ...yDescriptorClientRegistrationProvider.java | 10 ++-- .../KeycloakSamlClientInstallation.java | 6 +-- .../KeycloakSamlSubsystemCliInstallation.java | 6 +-- .../KeycloakSamlSubsystemInstallation.java | 4 +- .../ModAuthMellonClientInstallation.java | 2 +- .../SamlSPDescriptorClientInstallation.java | 4 +- .../profile/ecp/SamlEcpProfileService.java | 6 +-- .../authenticator/HttpBasicAuthenticator.java | 4 +- .../protocol/saml/profile/util/Soap.java | 32 ++++++------- .../services/CorsErrorResponseException.java | 6 +-- .../services/DefaultKeycloakContext.java | 4 +- .../DefaultKeycloakTransactionManager.java | 2 +- .../java/org/keycloak/services/ErrorPage.java | 2 +- .../keycloak/services/ErrorPageException.java | 4 +- .../org/keycloak/services/ErrorResponse.java | 4 +- .../services/ErrorResponseException.java | 6 +-- .../keycloak/services/ForbiddenException.java | 2 +- .../keycloak/services/HttpRequestImpl.java | 18 ++++---- .../main/java/org/keycloak/services/Urls.java | 2 +- .../context/AuthorizationRequestContext.java | 2 +- .../context/LogoutRequestContext.java | 4 +- ...sourceOwnerPasswordCredentialsContext.java | 2 +- ...nerPasswordCredentialsResponseContext.java | 2 +- .../ServiceAccountTokenRequestContext.java | 2 +- .../ServiceAccountTokenResponseContext.java | 2 +- .../context/TokenIntrospectContext.java | 2 +- .../context/TokenRefreshContext.java | 2 +- .../context/TokenRefreshResponseContext.java | 2 +- .../context/TokenRequestContext.java | 2 +- .../context/TokenResponseContext.java | 2 +- .../context/TokenRevokeContext.java | 2 +- .../executor/HolderOfKeyEnforcerExecutor.java | 4 +- .../IntentClientBindCheckExecutor.java | 4 +- .../executor/PKCEEnforcerExecutor.java | 2 +- ...OwnerPasswordCredentialsGrantExecutor.java | 2 +- .../executor/SecureLogoutExecutor.java | 2 +- .../executor/SecureRequestObjectExecutor.java | 2 +- .../AbstractClientRegistrationProvider.java | 2 +- ...nstallationClientRegistrationProvider.java | 12 ++--- .../ClientRegistrationAuth.java | 4 +- .../ClientRegistrationService.java | 8 ++-- .../DefaultClientRegistrationProvider.java | 20 ++++---- .../oidc/OIDCClientRegistrationProvider.java | 20 ++++---- ...cUnrecognizedPropertyExceptionHandler.java | 8 ++-- .../services/error/KeycloakErrorHandler.java | 12 ++--- .../KeycloakSecurityHeadersFilter.java | 11 +++-- .../services/managers/AppAuthManager.java | 6 +-- .../managers/AuthenticationManager.java | 12 ++--- .../AuthenticationSessionManager.java | 2 +- .../managers/ResourceAdminManager.java | 4 +- .../AbstractSecuredLocalService.java | 16 +++---- .../resources/ClientsManagementService.java | 24 +++++----- .../org/keycloak/services/resources/Cors.java | 4 +- .../resources/IdentityBrokerService.java | 24 +++++----- .../services/resources/JsResource.java | 16 +++---- .../resources/KeycloakApplication.java | 6 +-- .../resources/LoginActionsService.java | 26 +++++------ .../LoginActionsServiceException.java | 2 +- .../resources/LogoutSessionCodeChecks.java | 4 +- .../resources/PublicRealmResource.java | 14 +++--- .../services/resources/RealmsResource.java | 24 +++++----- .../services/resources/RobotsResource.java | 6 +-- .../services/resources/SessionCodeChecks.java | 8 ++-- .../services/resources/ThemeResource.java | 10 ++-- .../services/resources/WelcomeResource.java | 28 +++++------ .../resources/account/AccountConsole.java | 10 ++-- .../account/AccountCredentialResource.java | 22 ++++----- .../resources/account/AccountFormService.java | 30 ++++++------ .../resources/account/AccountLoader.java | 20 ++++---- .../resources/account/AccountRestService.java | 28 +++++------ .../account/CorsPreflightService.java | 6 +-- .../account/LinkedAccountsResource.java | 18 ++++---- .../resources/account/SessionResource.java | 16 +++---- .../account/resources/ResourceService.java | 18 ++++---- .../account/resources/ResourcesService.java | 18 ++++---- .../resources/admin/AdminConsole.java | 14 +++--- .../admin/AdminCorsPreflightService.java | 6 +-- .../resources/admin/AdminEventBuilder.java | 2 +- .../services/resources/admin/AdminRoot.java | 24 +++++----- .../admin/AttackDetectionResource.java | 14 +++--- .../AuthenticationManagementResource.java | 28 +++++------ .../ClientAttributeCertificateResource.java | 22 ++++----- .../admin/ClientInitialAccessResource.java | 20 ++++---- .../admin/ClientPoliciesResource.java | 14 +++--- .../admin/ClientProfilesResource.java | 16 +++---- .../ClientRegistrationPolicyResource.java | 8 ++-- .../resources/admin/ClientResource.java | 30 ++++++------ .../admin/ClientRoleMappingsResource.java | 24 +++++----- .../admin/ClientScopeEvaluateResource.java | 16 +++---- ...entScopeEvaluateScopeMappingsResource.java | 8 ++-- .../resources/admin/ClientScopeResource.java | 16 +++---- .../resources/admin/ClientScopesResource.java | 18 ++++---- .../resources/admin/ClientsResource.java | 22 ++++----- .../resources/admin/ComponentResource.java | 28 +++++------ .../resources/admin/GroupResource.java | 22 ++++----- .../resources/admin/GroupsResource.java | 22 ++++----- .../admin/IdentityProviderResource.java | 46 +++++++++---------- .../admin/IdentityProvidersResource.java | 22 ++++----- .../services/resources/admin/KeyResource.java | 6 +-- .../admin/ProtocolMappersResource.java | 22 ++++----- .../resources/admin/RealmAdminResource.java | 36 +++++++-------- .../admin/RealmLocalizationResource.java | 26 +++++------ .../resources/admin/RealmsAdminResource.java | 24 +++++----- .../resources/admin/RoleByIdResource.java | 24 +++++----- .../admin/RoleContainerResource.java | 30 ++++++------ .../resources/admin/RoleMapperResource.java | 26 +++++------ .../resources/admin/RoleResource.java | 4 +- .../admin/ScopeMappedClientResource.java | 20 ++++---- .../resources/admin/ScopeMappedResource.java | 22 ++++----- .../resources/admin/UserProfileResource.java | 12 ++--- .../resources/admin/UserResource.java | 34 +++++++------- .../resources/admin/UsersResource.java | 24 +++++----- .../admin/info/ServerInfoAdminResource.java | 8 ++-- .../util/AuthenticationFlowURLHelper.java | 6 +-- .../services/util/BrowserHistoryHelper.java | 2 +- .../services/util/CacheControlUtil.java | 2 +- .../keycloak/services/util/CookieHelper.java | 4 +- .../services/util/ObjectMapperResolver.java | 4 +- .../services/util/ResolveRelative.java | 2 +- .../bitbucket/BitbucketIdentityProvider.java | 2 +- .../social/gitlab/GitLabIdentityProvider.java | 4 +- .../social/google/GoogleIdentityProvider.java | 4 +- .../OpenshiftV3IdentityProvider.java | 2 +- .../twitter/TwitterIdentityProvider.java | 16 +++---- .../org/keycloak/theme/beans/LocaleBean.java | 2 +- .../transaction/AsyncResponseTransaction.java | 4 +- .../JBossJtaTransactionManagerLookup.java | 2 +- .../transaction/JtaTransactionWrapper.java | 8 ++-- .../transaction/UserTransactionWrapper.java | 4 +- .../keycloak/url/DefaultHostnameProvider.java | 2 +- .../keycloak/url/FixedHostnameProvider.java | 2 +- .../keycloak/url/RequestHostnameProvider.java | 2 +- .../url/RequestHostnameProviderFactory.java | 2 +- .../validator/DuplicateEmailValidator.java | 2 +- .../validator/DuplicateUsernameValidator.java | 2 +- .../EmailExistsAsUsernameValidator.java | 2 +- .../RegistrationUsernameExistsValidator.java | 2 +- .../java/org/keycloak/utils/MediaType.java | 20 ++++---- .../org/keycloak/utils/MediaTypeMatcher.java | 6 +-- .../java/org/keycloak/utils/OAuth2Error.java | 14 +++--- .../org/keycloak/utils/ProfileHelper.java | 4 +- ...erComposeYamlInstallationProviderTest.java | 2 +- .../client/BackoffRetryPolicy.java | 2 +- .../client/DBAllocatorServiceClient.java | 6 +-- .../exceptions/DBAllocatorException.java | 2 +- .../DBAllocatorUnavailableException.java | 2 +- .../retry/IncrementalBackoffRetryPolicy.java | 2 +- .../client/DBAllocatorServiceClientTest.java | 2 +- .../dballocator/client/mock/MockResponse.java | 14 +++--- .../IncrementalBackoffRetryPolicyTest.java | 2 +- .../undertow/UndertowAppServer.java | 6 +-- .../saml/util/RestSamlApplicationConfig.java | 2 +- .../PushButtonAuthenticator.java | 2 +- ...stKeycloakOidcIdentityProviderFactory.java | 2 +- .../domainextension/jpa/Company.java | 12 ++--- .../domainextension/rest/CompanyResource.java | 18 ++++---- .../rest/ExampleRestResource.java | 6 +-- .../spi/impl/ExampleServiceImpl.java | 2 +- .../forms/ClickThroughAuthenticator.java | 2 +- .../forms/SetClientNoteAuthenticator.java | 2 +- .../rest/TestApplicationResourceProvider.java | 22 ++++----- .../TestSamlApplicationResourceProvider.java | 18 ++++---- .../rest/TestingResourceProvider.java | 26 +++++------ .../rest/resource/TestCacheResource.java | 12 ++--- .../rest/resource/TestJavascriptResource.java | 8 ++-- .../rest/resource/TestLDAPResource.java | 12 ++--- .../resource/TestingExportImportResource.java | 16 +++---- ...stingOIDCEndpointsApplicationResource.java | 24 +++++----- .../undertow/KeycloakOnUndertow.java | 6 +-- .../quickstart/profilejee/Controller.java | 4 +- .../example/oauth/DataApplication.java | 4 +- .../example/oauth/ProductService.java | 10 ++-- .../example/photoz/ErrorResponse.java | 4 +- .../example/photoz/PhotozApplication.java | 4 +- .../photoz/admin/AdminAlbumService.java | 12 ++--- .../example/photoz/album/AlbumService.java | 26 +++++------ .../example/photoz/album/ProfileService.java | 12 ++--- .../keycloak/example/photoz/entity/Album.java | 18 ++++---- .../keycloak/example/photoz/entity/Photo.java | 16 +++---- .../photoz/unsecured/UnsecuredService.java | 8 ++-- .../testsuite/servletauthz/TestFilter.java | 14 +++--- .../adapter/filter/AdapterActionsFilter.java | 6 +-- .../servlet/AbstractShowTokensServlet.java | 6 +-- .../adapter/servlet/BasicAuthServlet.java | 8 ++-- .../servlet/CallAuthenticatedServlet.java | 8 ++-- .../ClientInitiatedAccountLinkServlet.java | 10 ++-- .../servlet/CustomerDatabaseServlet.java | 8 ++-- .../adapter/servlet/CustomerServlet.java | 12 ++--- .../servlet/CustomerServletNoConf.java | 12 ++--- .../adapter/servlet/ErrorServlet.java | 8 ++-- .../adapter/servlet/InputServlet.java | 10 ++-- .../servlet/KerberosCredDelegServlet.java | 8 ++-- .../servlet/LinkAndExchangeServlet.java | 12 ++--- .../adapter/servlet/MultiTenantServlet.java | 8 ++-- .../adapter/servlet/OfflineTokenServlet.java | 8 ++-- .../adapter/servlet/ProductServlet.java | 8 ++-- .../adapter/servlet/SamlSPFacade.java | 10 ++-- .../adapter/servlet/SendUsernameServlet.java | 24 +++++----- .../adapter/servlet/SerializationServlet.java | 8 ++-- .../adapter/servlet/SessionServlet.java | 12 ++--- .../adapter/servlet/TokenMinTTLServlet.java | 6 +-- .../java/org/keycloak/AdminController.java | 4 +- .../org/keycloak/helpers/DropAllServlet.java | 8 ++-- .../keycloak/testsuite/ActionURIUtils.java | 2 +- .../testsuite/adapter/page/BasicAuth.java | 2 +- .../adapter/page/CustomerPortal.java | 2 +- .../testsuite/adapter/page/MultiTenant.java | 2 +- .../testsuite/adapter/page/SAMLServlet.java | 2 +- .../page/SerializationServletPage.java | 2 +- .../org/keycloak/testsuite/admin/ApiUtil.java | 8 ++-- .../arquillian/AuthServerTestEnricher.java | 2 +- .../testsuite/auth/page/AuthRealm.java | 2 +- .../testsuite/auth/page/AuthServer.java | 2 +- .../auth/page/account/AccountManagement.java | 2 +- .../auth/page/account/Applications.java | 2 +- .../auth/page/account/Autheticator.java | 2 +- .../auth/page/account/ChangePassword.java | 2 +- .../testsuite/auth/page/account/Sessions.java | 2 +- .../auth/page/login/Authenticate.java | 2 +- .../testsuite/auth/page/login/Login.java | 2 +- .../auth/page/login/LoginActions.java | 2 +- .../auth/page/login/Registration.java | 2 +- .../auth/page/login/RequiredActions.java | 2 +- .../auth/page/login/ResetCredentials.java | 2 +- .../page/login/SAMLIDPInitiatedLogin.java | 2 +- .../client/KeycloakTestingClient.java | 2 +- .../resources/TestApplicationResource.java | 10 ++-- .../TestApplicationResourceUrls.java | 2 +- .../resources/TestExampleCompanyResource.java | 18 ++++---- .../TestOIDCEndpointsApplicationResource.java | 18 ++++---- .../TestSamlApplicationResource.java | 10 ++-- .../resources/TestingCacheResource.java | 12 ++--- .../TestingExportImportResource.java | 16 +++---- .../client/resources/TestingLDAPResource.java | 12 ++--- .../client/resources/TestingResource.java | 18 ++++---- .../testsuite/console/page/AdminConsole.java | 2 +- .../console/page/AdminConsoleCreate.java | 2 +- .../console/page/AdminConsoleRealmsRoot.java | 2 +- .../testsuite/console/page/ForbiddenPage.java | 2 +- .../keycloak/testsuite/page/AbstractPage.java | 2 +- .../page/AbstractPageWithInjectedUrl.java | 2 +- .../pages/AccountUpdateProfilePage.java | 2 +- .../org/keycloak/testsuite/pages/AppPage.java | 2 +- .../testsuite/servlet/ApplicationServlet.java | 10 ++-- .../keycloak/testsuite/updaters/Creator.java | 4 +- .../updaters/IdentityProviderCreator.java | 4 +- .../util/ArtifactResolutionService.java | 12 ++--- .../testsuite/util/GreenMailRule.java | 2 +- .../keycloak/testsuite/util/MailUtils.java | 8 ++-- .../org/keycloak/testsuite/util/Matchers.java | 2 +- .../util/MessageHandlerFactoryImpl.java | 6 +-- .../testsuite/util/MutualTLSUtils.java | 10 ++-- .../keycloak/testsuite/util/OAuthClient.java | 6 +-- .../keycloak/testsuite/util/SamlClient.java | 22 ++++----- .../testsuite/util/SamlClientBuilder.java | 2 +- .../keycloak/testsuite/util/TestCleanup.java | 2 +- .../testsuite/util/TokenSignatureUtil.java | 2 +- .../testsuite/util/UserInfoClientUtil.java | 12 ++--- .../matchers/HttpResponseBodyMatcher.java | 2 +- .../HttpResponseStatusCodeMatcher.java | 2 +- .../util/matchers/ResponseBodyMatcher.java | 2 +- .../util/matchers/ResponseHeaderMatcher.java | 2 +- .../matchers/ResponseStatusCodeMatcher.java | 2 +- .../saml/CreateAuthnRequestStepBuilder.java | 2 +- .../util/saml/HandleArtifactStepBuilder.java | 2 +- .../testsuite/util/saml/LoginBuilder.java | 4 +- .../saml/ModifySamlResponseStepBuilder.java | 2 +- .../util/saml/RequiredConsentBuilder.java | 4 +- .../util/saml/UpdateProfileBuilder.java | 4 +- .../testsuite/AbstractKeycloakTest.java | 4 +- .../account/AbstractRestServiceTest.java | 2 +- ...ountRestServiceReadOnlyAttributesTest.java | 2 +- .../account/AccountRestServiceTest.java | 4 +- .../account/ResourcesRestServiceTest.java | 2 +- .../custom/CustomAuthFlowCookieTest.java | 2 +- .../account/custom/CustomAuthFlowOTPTest.java | 4 +- .../account/custom/CustomThemeTest.java | 2 +- .../AbstractAppInitiatedActionTest.java | 2 +- ...ActionUpdateEmailWithVerificationTest.java | 8 ++-- .../RequiredActionEmailVerificationTest.java | 4 +- ...onUpdateEmailTestWithVerificationTest.java | 8 ++-- .../adapter/AbstractServletsAdapterTest.java | 2 +- .../AbstractSAMLServletAdapterTest.java | 4 +- .../BrokerLinkAndTokenExchangeTest.java | 14 +++--- .../ClientInitiatedAccountLinkTest.java | 4 +- .../servlet/DemoServletsAdapterTest.java | 16 +++---- .../adapter/servlet/MultiTenancyTest.java | 2 +- .../OIDCPublicKeyRotationAdapterTest.java | 4 +- .../servlet/OfflineServletsAdapterTest.java | 2 +- .../SAMLLoginResponseHandlingTest.java | 2 +- .../servlet/SAMLLogoutAdapterTest.java | 2 +- .../servlet/SAMLServletAdapterTest.java | 36 +++++++-------- .../adapter/servlet/SamlSignatureTest.java | 2 +- .../servlet/UserStorageConsentTest.java | 2 +- .../testsuite/admin/AdminClientTest.java | 4 +- .../testsuite/admin/AdminHeadersTest.java | 4 +- .../keycloak/testsuite/admin/ClientTest.java | 6 +-- .../testsuite/admin/ComponentsTest.java | 4 +- .../admin/CrossRealmPermissionsTest.java | 4 +- .../testsuite/admin/DeclarativeUserTest.java | 6 +-- .../admin/FineGrainAdminUnitTest.java | 6 +-- .../testsuite/admin/IdentityProviderTest.java | 8 ++-- .../admin/IllegalAdminUpgradeTest.java | 4 +- .../admin/ImpersonationDisabledTest.java | 4 +- .../testsuite/admin/ImpersonationTest.java | 6 +-- .../admin/ManagementPermissionsTest.java | 2 +- .../testsuite/admin/PermissionsTest.java | 4 +- .../admin/RealmLocalizationResourceTest.java | 2 +- .../testsuite/admin/RoleByIdResourceTest.java | 6 +-- .../testsuite/admin/SMTPConnectionTest.java | 4 +- .../UserFederationLdapConnectionTest.java | 4 +- .../testsuite/admin/UserStorageRestTest.java | 4 +- .../keycloak/testsuite/admin/UserTest.java | 12 ++--- .../AbstractAuthenticationTest.java | 2 +- .../AuthenticatorConfigTest.java | 6 +-- .../admin/authentication/ExecutionTest.java | 6 +-- .../admin/authentication/FlowTest.java | 12 ++--- .../admin/authentication/ProvidersTest.java | 2 +- .../authentication/RegistrationFlowTest.java | 2 +- .../authentication/RequiredActionsTest.java | 4 +- .../authentication/ShiftExecutionTest.java | 6 +-- .../ShiftRequiredActionTest.java | 2 +- .../admin/client/AbstractClientTest.java | 2 +- .../client/ClientProtocolMapperTest.java | 4 +- .../admin/client/ClientRolesTest.java | 2 +- .../client/ClientScopeProtocolMapperTest.java | 4 +- .../admin/client/ClientScopeTest.java | 8 ++-- .../admin/client/CredentialsTest.java | 2 +- .../admin/client/InstallationTest.java | 2 +- .../admin/concurrency/ConcurrencyTest.java | 4 +- .../concurrency/ConcurrentLoginTest.java | 2 +- .../admin/group/AbstractGroupTest.java | 2 +- .../testsuite/admin/group/GroupTest.java | 8 ++-- .../partialimport/PartialImportTest.java | 2 +- .../testsuite/admin/realm/RealmRolesTest.java | 8 ++-- .../testsuite/admin/realm/RealmTest.java | 6 +-- .../authz/AbstractResourceServerTest.java | 2 +- .../testsuite/authz/AuthorizationAPITest.java | 2 +- .../testsuite/authz/AuthorizationTest.java | 2 +- .../testsuite/authz/EntitlementAPITest.java | 2 +- .../testsuite/authz/PermissionClaimTest.java | 2 +- .../authz/UmaDiscoveryDocumentTest.java | 8 ++-- .../testsuite/authz/UmaGrantTypeTest.java | 12 ++--- .../UserManagedPermissionServiceTest.java | 2 +- .../AbstractBasePhotozExampleAdapterTest.java | 2 +- .../AbstractBaseServletAuthzAdapterTest.java | 2 +- .../AbstractServletAuthzAdapterTest.java | 2 +- .../adapter/example/LifespanAdapterTest.java | 2 +- .../example/ServletAuthzCIPAdapterTest.java | 10 ++-- .../admin/AbstractAuthorizationTest.java | 2 +- .../admin/AbstractPolicyManagementTest.java | 2 +- .../admin/AggregatePolicyManagementTest.java | 4 +- .../AuthorizationDisabledInPreviewTest.java | 4 +- .../admin/ClientPolicyManagementTest.java | 4 +- .../ExportAuthorizationSettingsTest.java | 4 +- .../admin/GenericPolicyManagementTest.java | 2 +- .../admin/GroupPolicyManagementTest.java | 4 +- .../authz/admin/JSPolicyManagementTest.java | 4 +- .../authz/admin/PolicyEnforcerClaimsTest.java | 2 +- .../authz/admin/PolicyEnforcerTest.java | 10 ++-- .../authz/admin/ResourceManagementTest.java | 4 +- .../ResourcePermissionManagementTest.java | 4 +- .../admin/ResourceServerManagementTest.java | 2 +- .../authz/admin/RolePolicyManagementTest.java | 4 +- .../authz/admin/ScopeManagementTest.java | 4 +- .../admin/ScopePermissionManagementTest.java | 4 +- .../authz/admin/TimePolicyManagementTest.java | 4 +- .../authz/admin/UserPolicyManagementTest.java | 4 +- .../broker/AbstractAdvancedBrokerTest.java | 12 ++--- .../broker/AbstractBaseBrokerTest.java | 6 +-- .../broker/AbstractFirstBrokerLoginTest.java | 4 +- .../broker/AbstractGroupMapperTest.java | 2 +- .../testsuite/broker/AccountLinkTest.java | 2 +- .../broker/KcOIDCBrokerWithSignatureTest.java | 4 +- ...cBrokerPrivateKeyJwtCustomSignAlgTest.java | 2 +- .../testsuite/broker/KcOidcBrokerTest.java | 2 +- .../KcSamlBrokerAllowedClockSkewTest.java | 2 +- .../broker/KcSamlBrokerFrontendUrlTest.java | 2 +- .../testsuite/broker/KcSamlBrokerTest.java | 2 +- .../broker/KcSamlIdPInitiatedSsoTest.java | 2 +- .../broker/KcSamlSignedBrokerTest.java | 2 +- .../OidcAdvancedClaimToGroupMapperTest.java | 2 +- .../testsuite/broker/SocialLoginTest.java | 12 ++--- .../AbstractClientRegistrationTest.java | 2 +- .../keycloak/testsuite/client/CIBATest.java | 4 +- .../testsuite/client/ClientRedirectTest.java | 8 ++-- .../ClientRegistrationPoliciesTest.java | 2 +- .../client/ClientRegistrationTest.java | 4 +- .../client/ClientSecretRotationTest.java | 8 ++-- .../OIDCJwksClientRegistrationTest.java | 2 +- .../OIDCPairwiseClientRegistrationTest.java | 4 +- .../policies/AbstractClientPoliciesTest.java | 4 +- .../AuthenticationSessionClusterTest.java | 2 +- ...henticationSessionFailoverClusterTest.java | 2 +- .../ClientInvalidationClusterTest.java | 4 +- .../ComponentInvalidationClusterTest.java | 4 +- .../cluster/GroupInvalidationClusterTest.java | 4 +- .../cluster/RealmInvalidationClusterTest.java | 2 +- .../cluster/RoleInvalidationClusterTest.java | 2 +- .../cluster/UserInvalidationClusterTest.java | 4 +- .../crossdc/ActionTokenCrossDCTest.java | 6 +-- .../crossdc/BruteForceCrossDCTest.java | 2 +- .../crossdc/InvalidationCrossDCTest.java | 2 +- .../LastSessionRefreshCrossDCTest.java | 2 +- .../testsuite/crossdc/LoginCrossDCTest.java | 2 +- .../crossdc/SessionExpirationCrossDCTest.java | 2 +- .../error/UncaughtErrorPageTest.java | 2 +- .../AbstractKerberosSingleRealmTest.java | 4 +- .../kerberos/AbstractKerberosTest.java | 2 +- .../KerberosLdapCrossRealmTrustTest.java | 2 +- .../federation/kerberos/KerberosLdapTest.java | 2 +- .../kerberos/KerberosStandaloneTest.java | 8 ++-- .../federation/ldap/LDAPAdminRestApiTest.java | 4 +- .../LDAPAdminRestApiWithUserProfileTest.java | 4 +- .../ldap/LDAPBinaryAttributesTest.java | 4 +- .../ldap/LDAPGroupMapperSyncTest.java | 2 +- ...LDAPGroupMapperSyncWithGroupsPathTest.java | 2 +- .../federation/ldap/LDAPNoCacheTest.java | 4 +- .../ldap/LDAPProvidersIntegrationTest.java | 2 +- .../federation/ldap/LDAPReadOnlyTest.java | 2 +- ...SamlIdPInitiatedVaryingLetterCaseTest.java | 4 +- .../federation/ldap/LDAPSyncTest.java | 2 +- .../LDAPProvidersIntegrationNoImportTest.java | 4 +- ...BackwardsCompatibilityUserStorageTest.java | 1 + .../federation/storage/ClientStorageTest.java | 14 +++--- .../storage/ComponentExportImportTest.java | 2 +- .../FederatedStorageExportImportTest.java | 2 +- .../federation/storage/GroupStorageTest.java | 2 +- .../federation/storage/RoleStorageTest.java | 2 +- .../federation/storage/UserStorageTest.java | 6 +-- .../testsuite/forms/BrowserButtonsTest.java | 4 +- .../testsuite/forms/BruteForceTest.java | 2 +- .../testsuite/forms/CustomFlowTest.java | 4 +- .../testsuite/forms/FlowOverrideTest.java | 12 ++--- .../forms/LevelOfAssuranceFlowTest.java | 4 +- .../testsuite/forms/LoginTotpTest.java | 10 ++-- .../testsuite/forms/PasswordHashingTest.java | 2 +- .../testsuite/forms/RegisterTest.java | 4 +- .../ResetCredentialsAlternativeFlowsTest.java | 2 +- .../testsuite/forms/ResetPasswordTest.java | 4 +- .../forms/ScriptAuthenticatorTest.java | 2 +- .../testsuite/forms/VerifyProfileTest.java | 2 +- .../keycloak/testsuite/i18n/EmailTest.java | 4 +- .../testsuite/i18n/LoginPageTest.java | 2 +- .../keys/GeneratedEcdsaKeyProviderTest.java | 4 +- .../keys/GeneratedHmacKeyProviderTest.java | 2 +- .../keys/GeneratedRsaKeyProviderTest.java | 2 +- .../keys/ImportedRsaKeyProviderTest.java | 2 +- .../keys/JavaKeystoreKeyProviderTest.java | 2 +- .../testsuite/keys/KeyRotationTest.java | 2 +- .../metrics/MetricsRestServiceTest.java | 6 +-- .../testsuite/migration/MigrationTest.java | 2 +- .../testsuite/oauth/AccessTokenTest.java | 14 +++--- .../oauth/AuthorizationCodeTest.java | 2 +- .../oauth/BackchannelLogoutTest.java | 2 +- .../oauth/ClientAuthSecretSignedJWTTest.java | 4 +- .../oauth/ClientAuthSignedJWTTest.java | 2 +- .../oauth/ClientTokenExchangeSAML2Test.java | 12 ++--- .../oauth/ClientTokenExchangeTest.java | 12 ++--- .../testsuite/oauth/LegacyLogoutTest.java | 2 +- .../testsuite/oauth/LogoutCorsTest.java | 2 +- .../keycloak/testsuite/oauth/LogoutTest.java | 6 +-- .../testsuite/oauth/OAuthGrantTest.java | 2 +- .../OAuthProofKeyForCodeExchangeTest.java | 2 +- .../oauth/OAuthScopeInTokenResponseTest.java | 2 +- .../oauth/OIDCProtocolMappersTest.java | 4 +- .../testsuite/oauth/OfflineTokenTest.java | 2 +- .../oauth/RPInitiatedLogoutTest.java | 8 ++-- .../testsuite/oauth/RefreshTokenTest.java | 14 +++--- ...urceOwnerPasswordCredentialsGrantTest.java | 6 +-- .../testsuite/oauth/ServiceAccountTest.java | 4 +- .../oauth/TokenIntrospectionTest.java | 2 +- .../oauth/TokenRevocationCorsTest.java | 2 +- .../testsuite/oauth/TokenRevocationTest.java | 8 ++-- .../oauth/UserInfoEndpointCorsTest.java | 6 +-- .../keycloak/testsuite/oauth/hok/HoKTest.java | 12 ++--- .../keycloak/testsuite/oauth/par/ParTest.java | 2 +- .../oauth/rar/DynamicScopesRARParseTest.java | 2 +- .../keycloak/testsuite/oidc/AudienceTest.java | 2 +- .../AuthorizationTokenResponseModeTest.java | 2 +- .../oidc/OIDCAdvancedRequestParamsTest.java | 6 +-- .../testsuite/oidc/OIDCDynamicScopeTest.java | 2 +- .../testsuite/oidc/OIDCScopeTest.java | 4 +- .../oidc/OIDCWellKnownProviderTest.java | 10 ++-- .../keycloak/testsuite/oidc/UserInfoTest.java | 16 +++---- .../flows/AbstractOIDCResponseTypeTest.java | 2 +- .../OpenShiftTokenReviewEndpointTest.java | 4 +- .../openshift/OpenshiftClientStorageTest.java | 2 +- .../policy/PasswordHistoryPolicyTest.java | 4 +- .../testsuite/saml/AbstractSamlTest.java | 4 +- .../testsuite/saml/ArtifactBindingTest.java | 2 +- .../saml/AudienceProtocolMappersTest.java | 2 +- .../testsuite/saml/BasicSamlTest.java | 6 +-- .../keycloak/testsuite/saml/BrokerTest.java | 2 +- .../testsuite/saml/IdpInitiatedLoginTest.java | 2 +- .../keycloak/testsuite/saml/LogoutTest.java | 4 +- .../testsuite/saml/SOAPBindingTest.java | 6 +-- .../SamlClientCertificateExpirationTest.java | 2 +- .../testsuite/saml/SamlReverseProxyTest.java | 4 +- .../testsuite/saml/SamlXMLAttacksTest.java | 2 +- .../script/DeployedSAMLScriptMapperTest.java | 2 +- .../DeployedScriptAuthenticatorTest.java | 2 +- .../script/DeployedScriptPolicyTest.java | 2 +- .../sessionlimits/UserSessionLimitsTest.java | 2 +- .../testsuite/url/DefaultHostnameTest.java | 2 +- .../testsuite/util/AdminEventPaths.java | 2 +- .../keycloak/testsuite/util/MailAssert.java | 8 ++-- .../keycloak/testsuite/util/MailServer.java | 8 ++-- .../keycloak/testsuite/util/RealmManager.java | 2 +- .../testsuite/util/SslMailServer.java | 2 +- .../testsuite/util/TestAppHelper.java | 2 +- .../x509/AbstractX509AuthenticationTest.java | 2 +- .../testsuite/x509/X509BrowserLoginTest.java | 2 +- .../testsuite/x509/X509DirectGrantTest.java | 2 +- .../x509/X509OCSPResponderFailOpenTest.java | 4 +- .../X509OCSPResponderSpecificCertTest.java | 2 +- .../testsuite/x509/X509OCSPResponderTest.java | 2 +- ...TomcatDeploymentArchiveProcessorUtils.java | 4 +- .../utils/undertow/SimpleWebXmlParser.java | 6 +-- .../undertow/UndertowDeployerHelper.java | 4 +- .../testsuite/model/MigrationModelTest.java | 2 +- .../testsuite/JsonConfigProviderFactory.java | 2 +- .../keycloak/testsuite/KeycloakServer.java | 4 +- .../org/keycloak/testsuite/MailServer.java | 6 +-- .../testsuite/UndertowRequestFilter.java | 12 ++--- 1182 files changed, 4609 insertions(+), 4602 deletions(-) diff --git a/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java b/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java index 685b55275be3..e6637ec59a7f 100644 --- a/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java +++ b/adapters/oidc/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java @@ -40,10 +40,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilter.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilter.java index 9e66bc0ee00c..8b06402a869e 100644 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilter.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilter.java @@ -17,10 +17,11 @@ package org.keycloak.jaxrs; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; +import jakarta.annotation.Priority; + +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; /** * @author Marek Posolda diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java index a44a4e566056..62bf9c7853f8 100755 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java @@ -17,6 +17,7 @@ package org.keycloak.jaxrs; +import jakarta.annotation.Priority; import org.keycloak.KeycloakPrincipal; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterUtils; @@ -34,12 +35,11 @@ import org.keycloak.adapters.spi.UserSessionManagement; import org.keycloak.common.constants.GenericConstants; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.SecurityContext; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java index 66599c45d908..cf22d8705dc0 100755 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java @@ -24,9 +24,9 @@ import org.keycloak.common.util.HostUtils; import javax.security.cert.X509Certificate; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.SecurityContext; import java.io.BufferedInputStream; import java.io.IOException; @@ -95,10 +95,10 @@ public String getQueryParamValue(String param) { @Override public Cookie getCookie(String cookieName) { - Map cookies = requestContext.getCookies(); + Map cookies = requestContext.getCookies(); if (cookies == null) return null; - javax.ws.rs.core.Cookie cookie = cookies.get(cookieName); + jakarta.ws.rs.core.Cookie cookie = cookies.get(cookieName); if (cookie == null) return null; return new Cookie(cookie.getName(), cookie.getValue(), cookie.getVersion(), cookie.getDomain(), cookie.getPath()); @@ -153,7 +153,7 @@ public void setError(LogoutError error) { protected class ResponseFacade implements OIDCHttpFacade.Response { - private javax.ws.rs.core.Response.ResponseBuilder responseBuilder = javax.ws.rs.core.Response.status(204); + private jakarta.ws.rs.core.Response.ResponseBuilder responseBuilder = jakarta.ws.rs.core.Response.status(204); @Override public void setStatus(int status) { @@ -190,21 +190,21 @@ public OutputStream getOutputStream() { @Override public void sendError(int code) { - javax.ws.rs.core.Response response = responseBuilder.status(code).build(); + jakarta.ws.rs.core.Response response = responseBuilder.status(code).build(); requestContext.abortWith(response); responseFinished = true; } @Override public void sendError(int code, String message) { - javax.ws.rs.core.Response response = responseBuilder.status(code).entity(message).build(); + jakarta.ws.rs.core.Response response = responseBuilder.status(code).entity(message).build(); requestContext.abortWith(response); responseFinished = true; } @Override public void end() { - javax.ws.rs.core.Response response = responseBuilder.build(); + jakarta.ws.rs.core.Response response = responseBuilder.build(); requestContext.abortWith(response); responseFinished = true; } diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsOAuthClient.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsOAuthClient.java index 2ec416d1794d..39955ba2a07c 100755 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsOAuthClient.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsOAuthClient.java @@ -22,17 +22,17 @@ import org.keycloak.representations.AccessTokenResponse; import org.keycloak.util.TokenUtil; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.Map; import java.util.logging.Logger; diff --git a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java index fca53d87f768..41c3ff312086 100644 --- a/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java +++ b/adapters/oidc/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java @@ -17,13 +17,13 @@ package org.keycloak.jaxrs; +import jakarta.annotation.Priority; import org.keycloak.adapters.KeycloakConfigResolver; import org.keycloak.common.constants.GenericConstants; import org.osgi.framework.BundleContext; -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.PreMatching; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.PreMatching; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java index a66252d1ab80..38a848e295ac 100755 --- a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java +++ b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java @@ -52,10 +52,10 @@ import org.keycloak.representations.adapters.config.AdapterConfig; import javax.security.auth.Subject; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java index 38a2480b540f..a83ea637538a 100755 --- a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java +++ b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java @@ -30,7 +30,7 @@ import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.spi.HttpFacade; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.Set; diff --git a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java index aada9c6fded0..7ce8a2b48b5c 100755 --- a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java +++ b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java @@ -29,7 +29,7 @@ import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.spi.AdapterSessionStore; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * Handle storage of token info in HTTP Session. Per-request object diff --git a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java index 78fa6f1d4449..208af9c0745d 100755 --- a/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java +++ b/adapters/oidc/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java @@ -21,7 +21,7 @@ import org.keycloak.adapters.OIDCHttpFacade; import org.keycloak.adapters.jetty.spi.JettyHttpFacade; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * @author Bill Burke diff --git a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94RequestAuthenticator.java b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94RequestAuthenticator.java index fa6d75f7e9c4..cbe756c2bfd3 100644 --- a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94RequestAuthenticator.java +++ b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94RequestAuthenticator.java @@ -23,7 +23,7 @@ import org.keycloak.adapters.jetty.core.JettyRequestAuthenticator; import org.keycloak.adapters.spi.HttpFacade; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94SessionManager.java b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94SessionManager.java index 044e30cd8f1e..b676700089e0 100755 --- a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94SessionManager.java +++ b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/Jetty94SessionManager.java @@ -21,7 +21,7 @@ import org.eclipse.jetty.server.session.SessionHandler; import org.keycloak.adapters.jetty.spi.JettySessionManager; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java index 642bdf566394..9a5b91ffc75f 100644 --- a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java +++ b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java @@ -24,7 +24,7 @@ import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.common.util.MultivaluedHashMap; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/KeycloakJettyAuthenticator.java b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/KeycloakJettyAuthenticator.java index 3ae9327cfec5..daabc4d8c228 100644 --- a/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/KeycloakJettyAuthenticator.java +++ b/adapters/oidc/jetty/jetty9.4/src/main/java/org/keycloak/adapters/jetty/KeycloakJettyAuthenticator.java @@ -28,7 +28,7 @@ import org.keycloak.adapters.jetty.spi.JettyHttpFacade; import org.keycloak.adapters.jetty.spi.JettyUserSessionManagement; -import javax.servlet.ServletRequest; +import jakarta.servlet.ServletRequest; /** * @author Bill Burke diff --git a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/FilterRequestAuthenticator.java b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/FilterRequestAuthenticator.java index 11bd5aed0ea2..6e3f9cf012c6 100755 --- a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/FilterRequestAuthenticator.java +++ b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/FilterRequestAuthenticator.java @@ -29,8 +29,8 @@ import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.spi.KeycloakAccount; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.Set; import java.util.logging.Level; diff --git a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java index e8e7f8dd19a0..b7ae3135337b 100755 --- a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java +++ b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java @@ -30,15 +30,15 @@ import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.UserSessionManagement; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java index 991c85fdf499..4b4ddc5c97b3 100755 --- a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java +++ b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java @@ -29,9 +29,9 @@ import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.common.util.DelegatingSerializationFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCServletHttpFacade.java b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCServletHttpFacade.java index 1d632aa760dd..a41e02be059f 100755 --- a/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCServletHttpFacade.java +++ b/adapters/oidc/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCServletHttpFacade.java @@ -20,8 +20,8 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.OIDCHttpFacade; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Bill Burke diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/HttpHeaderInspectingApiRequestMatcher.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/HttpHeaderInspectingApiRequestMatcher.java index 3f18a8bf8e8a..3bcb276c0af6 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/HttpHeaderInspectingApiRequestMatcher.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/HttpHeaderInspectingApiRequestMatcher.java @@ -21,7 +21,7 @@ import org.springframework.http.MediaType; import org.springframework.security.web.util.matcher.RequestMatcher; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * {@link RequestMatcher} that determines if a given request is an API request or an diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationEntryPoint.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationEntryPoint.java index 95717fc2fbbe..766fb6844c7f 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationEntryPoint.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationEntryPoint.java @@ -19,9 +19,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.http.HttpHeaders; import org.keycloak.adapters.AdapterDeploymentContext; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationFailureHandler.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationFailureHandler.java index fdb6cb84c18d..4263d86577ad 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationFailureHandler.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationFailureHandler.java @@ -20,9 +20,9 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.AuthenticationFailureHandler; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationSuccessHandler.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationSuccessHandler.java index 7a0eab9b6a86..09b682c8737f 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationSuccessHandler.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationSuccessHandler.java @@ -18,9 +18,9 @@ package org.keycloak.adapters.springsecurity.authentication; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakCookieBasedRedirect.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakCookieBasedRedirect.java index b3b8e7e5f781..c6b2fd48e457 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakCookieBasedRedirect.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakCookieBasedRedirect.java @@ -17,8 +17,8 @@ package org.keycloak.adapters.springsecurity.authentication; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; /** * Utility class that provides methods to create and retrieve cookies used for login redirects. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakLogoutHandler.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakLogoutHandler.java index 213788655f0c..6694b2c09663 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakLogoutHandler.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/KeycloakLogoutHandler.java @@ -31,8 +31,8 @@ import org.springframework.security.web.authentication.logout.LogoutHandler; import org.springframework.util.Assert; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Logs the current user out of Keycloak. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/RequestAuthenticatorFactory.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/RequestAuthenticatorFactory.java index e640f1b8eb0c..27d49162e551 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/RequestAuthenticatorFactory.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/RequestAuthenticatorFactory.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.springsecurity.authentication; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.KeycloakDeployment; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java index e9b850d992c0..8705b19f7d0e 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java @@ -35,8 +35,8 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.util.Set; /** diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorFactory.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorFactory.java index 15aed06d4d22..fd0f7c6d78c6 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorFactory.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorFactory.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.springsecurity.authentication; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.KeycloakDeployment; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/SimpleHttpFacade.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/SimpleHttpFacade.java index 2c9876eace32..ead34b70280e 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/SimpleHttpFacade.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/SimpleHttpFacade.java @@ -27,8 +27,8 @@ import org.springframework.util.Assert; import javax.security.cert.X509Certificate; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Simple {@link org.keycloak.adapters.OIDCHttpFacade} wrapping an {@link HttpServletRequest} and {@link HttpServletResponse}. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java index f4fa0746911f..544701871c67 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java @@ -23,7 +23,7 @@ import org.keycloak.adapters.spi.LogoutError; import org.springframework.util.Assert; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedInputStream; import java.io.IOException; @@ -91,13 +91,13 @@ public String getQueryParamValue(String param) { @Override public Cookie getCookie(String cookieName) { - javax.servlet.http.Cookie[] cookies = request.getCookies(); + jakarta.servlet.http.Cookie[] cookies = request.getCookies(); if (cookies == null) { return null; } - for (javax.servlet.http.Cookie cookie : request.getCookies()) { + for (jakarta.servlet.http.Cookie cookie : request.getCookies()) { if (cookie.getName().equals(cookieName)) { return new Cookie(cookie.getName(), cookie.getValue(), cookie.getVersion(), cookie.getDomain(), cookie.getPath()); } diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java index c246e1328a07..442d3b676c23 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java @@ -21,8 +21,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.lang.reflect.Method; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/AdapterStateCookieRequestMatcher.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/AdapterStateCookieRequestMatcher.java index bee9d15000ca..5fb46c3cc60a 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/AdapterStateCookieRequestMatcher.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/AdapterStateCookieRequestMatcher.java @@ -17,8 +17,8 @@ package org.keycloak.adapters.springsecurity.filter; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; import org.keycloak.constants.AdapterConstants; import org.springframework.security.web.util.matcher.RequestMatcher; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticatedActionsFilter.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticatedActionsFilter.java index 3ef324fa4e52..b05354c257f8 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticatedActionsFilter.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticatedActionsFilter.java @@ -18,12 +18,12 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java index 930867efd64a..fcdd1835cdd1 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java @@ -19,10 +19,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.keycloak.OAuth2Constants; import org.keycloak.adapters.AdapterDeploymentContext; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakCsrfRequestMatcher.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakCsrfRequestMatcher.java index 93a48f57378c..8fbec3a314a1 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakCsrfRequestMatcher.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakCsrfRequestMatcher.java @@ -21,7 +21,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.StringUtils; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java index 75bc815f27a5..9bf98b110eaa 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java @@ -31,12 +31,12 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.web.filter.GenericFilterBean; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakSecurityContextRequestFilter.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakSecurityContextRequestFilter.java index 4e17183ad30b..d52d2972f40a 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakSecurityContextRequestFilter.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakSecurityContextRequestFilter.java @@ -18,12 +18,12 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/QueryParamPresenceRequestMatcher.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/QueryParamPresenceRequestMatcher.java index 76164638e913..e4784208452c 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/QueryParamPresenceRequestMatcher.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/QueryParamPresenceRequestMatcher.java @@ -16,7 +16,7 @@ */ package org.keycloak.adapters.springsecurity.filter; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.web.util.matcher.RequestMatcher; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java index f711b3919d39..563bf5171fb3 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java @@ -19,7 +19,7 @@ import java.util.List; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import org.keycloak.adapters.spi.UserSessionManagement; import org.slf4j.Logger; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/LocalSessionManagementStrategy.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/LocalSessionManagementStrategy.java index 7487ac5f5130..d7b698f61e1e 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/LocalSessionManagementStrategy.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/LocalSessionManagementStrategy.java @@ -17,7 +17,7 @@ package org.keycloak.adapters.springsecurity.management; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/SessionManagementStrategy.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/SessionManagementStrategy.java index b39ca1b562c4..becaad054a7d 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/SessionManagementStrategy.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/SessionManagementStrategy.java @@ -17,7 +17,7 @@ package org.keycloak.adapters.springsecurity.management; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.util.Collection; /** diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/AdapterTokenStoreFactory.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/AdapterTokenStoreFactory.java index b8a60ce7d204..097798739e8d 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/AdapterTokenStoreFactory.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/AdapterTokenStoreFactory.java @@ -17,11 +17,11 @@ package org.keycloak.adapters.springsecurity.token; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.KeycloakDeployment; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Creates a per-request adapter token store. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactory.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactory.java index 321744cede52..1428db17634a 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactory.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactory.java @@ -22,8 +22,8 @@ import org.keycloak.enums.TokenStore; import org.springframework.util.Assert; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * {@link AdapterTokenStoreFactory} that returns a new {@link SpringSecurityTokenStore} for each request. diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityCookieTokenStore.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityCookieTokenStore.java index 92699f82b425..4a313da3f11c 100644 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityCookieTokenStore.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityCookieTokenStore.java @@ -18,8 +18,8 @@ package org.keycloak.adapters.springsecurity.token; import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterUtils; diff --git a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityTokenStore.java b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityTokenStore.java index a932dda6c323..1bf199d23c99 100755 --- a/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityTokenStore.java +++ b/adapters/oidc/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/SpringSecurityTokenStore.java @@ -30,8 +30,8 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.Assert; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; /** * Simple Spring {@link SecurityContext security context} aware {@link AdapterTokenStore adapter token store}. diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequestTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequestTest.java index cb259ce5f251..070b6d38b0d6 100644 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequestTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequestTest.java @@ -22,7 +22,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.web.bind.annotation.RequestMethod; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponseTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponseTest.java index 6349fbb840d2..461164cbdfec 100644 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponseTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponseTest.java @@ -23,7 +23,7 @@ import org.springframework.http.HttpStatus; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.http.Cookie; +import jakarta.servlet.http.Cookie; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java index c0a69c12685c..aa0fd8650674 100755 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java @@ -44,9 +44,9 @@ import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collections; import java.util.List; import java.util.UUID; diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilterTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilterTest.java index d23fd8fea67a..6688c4c8c4bd 100644 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilterTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilterTest.java @@ -6,9 +6,9 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.After; import org.junit.Before; diff --git a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java index 6984cd5fa53b..17de7ec4d186 100755 --- a/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java +++ b/adapters/oidc/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java @@ -25,8 +25,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; diff --git a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractAuthenticatedActionsValve.java b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractAuthenticatedActionsValve.java index 123c2ec0aa48..cf8293cf01a7 100644 --- a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractAuthenticatedActionsValve.java +++ b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractAuthenticatedActionsValve.java @@ -27,7 +27,7 @@ import org.keycloak.adapters.AuthenticatedActionsHandler; import org.keycloak.adapters.KeycloakDeployment; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.io.IOException; /** diff --git a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java index 975885398226..4901800e1170 100755 --- a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java +++ b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java @@ -37,9 +37,9 @@ import org.keycloak.constants.AdapterConstants; import org.keycloak.enums.TokenStore; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaRequestAuthenticator.java b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaRequestAuthenticator.java index 84c39a7655d5..c110b3506ed4 100755 --- a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaRequestAuthenticator.java +++ b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaRequestAuthenticator.java @@ -28,7 +28,7 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RequestAuthenticator; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.security.Principal; import java.util.Set; import java.util.logging.Level; diff --git a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/OIDCCatalinaHttpFacade.java b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/OIDCCatalinaHttpFacade.java index fb180ac7bfb1..78c63f83c302 100755 --- a/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/OIDCCatalinaHttpFacade.java +++ b/adapters/oidc/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/OIDCCatalinaHttpFacade.java @@ -20,7 +20,7 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.OIDCHttpFacade; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * @author Bill Burke diff --git a/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java index 02868820579b..044c4910c9e4 100755 --- a/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java +++ b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/KeycloakAuthenticatorValve.java @@ -29,7 +29,7 @@ import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.spi.HttpFacade; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Method; import java.security.Principal; diff --git a/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java index 8103959fcaa0..e09200db3783 100755 --- a/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java +++ b/adapters/oidc/tomcat/tomcat/src/main/java/org/keycloak/adapters/tomcat/TomcatRequestAuthenticator.java @@ -21,7 +21,7 @@ import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.KeycloakDeployment; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java index b73832192ab8..87cfcbfb4a63 100755 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/KeycloakServletExtension.java @@ -39,7 +39,7 @@ import org.keycloak.adapters.NodesRegistrationManagement; import org.keycloak.constants.AdapterConstants; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java index 6e076568e455..2cc862b86116 100755 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java @@ -30,10 +30,10 @@ import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.enums.TokenStore; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; /** diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java index 7f23b3bbd734..4d948727b382 100755 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java @@ -27,8 +27,8 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.spi.HttpFacade; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java index ef6081a21aed..5883c8642bb6 100755 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/ServletSessionTokenStore.java @@ -28,8 +28,8 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RequestAuthenticator; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; /** * Per-request object. Storage of tokens in servlet HTTP session. diff --git a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java index 6978ea54939c..f2572612397f 100644 --- a/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java +++ b/adapters/oidc/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowNodesRegistrationManagementWrapper.java @@ -19,8 +19,8 @@ import org.keycloak.adapters.NodesRegistrationManagement; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * @author Marek Posolda diff --git a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/ElytronHttpFacade.java b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/ElytronHttpFacade.java index 080fa8446a8e..b4ed27ac9361 100644 --- a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/ElytronHttpFacade.java +++ b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/ElytronHttpFacade.java @@ -43,10 +43,10 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.cert.X509Certificate; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakConfigurationServletListener.java b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakConfigurationServletListener.java index 29aa2ff676d2..79a3edf87e55 100644 --- a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakConfigurationServletListener.java +++ b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakConfigurationServletListener.java @@ -24,9 +24,9 @@ import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.constants.AdapterConstants; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakServletExtension.java b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakServletExtension.java index 5adf6e98f27e..e8e12d8a3183 100644 --- a/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakServletExtension.java +++ b/adapters/oidc/wildfly-elytron/src/main/java/org/keycloak/adapters/elytron/KeycloakServletExtension.java @@ -16,8 +16,8 @@ */ package org.keycloak.adapters.elytron; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequest; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequest; import io.undertow.server.HttpHandler; import io.undertow.servlet.ServletExtension; diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java index 7f40e5aed3cc..3832f4b5b1d2 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java @@ -36,13 +36,13 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPHeader; -import javax.xml.soap.SOAPHeaderElement; -import javax.xml.soap.SOAPMessage; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPBody; +import jakarta.xml.soap.SOAPEnvelope; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.soap.SOAPHeaderElement; +import jakarta.xml.soap.SOAPMessage; /** * @author Pedro Igor diff --git a/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java b/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java index 415c9deaf255..8a794169b754 100755 --- a/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java +++ b/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java @@ -53,12 +53,12 @@ import org.keycloak.saml.common.exceptions.ParsingException; import javax.security.auth.Subject; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java b/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java index ad5bd30b1bf0..23e50a8296ed 100755 --- a/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java +++ b/adapters/saml/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java @@ -29,7 +29,7 @@ import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.common.util.KeycloakUriBuilder; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.util.LinkedList; import java.util.List; import java.util.Set; diff --git a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java index fa618cb57375..ebd4e6d1c5d8 100644 --- a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java +++ b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SamlSessionStore.java @@ -24,7 +24,7 @@ import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.SessionIdMapper; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SessionManager.java b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SessionManager.java index bd560577b1ee..4bd3c16af1b5 100755 --- a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SessionManager.java +++ b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/Jetty9SessionManager.java @@ -21,7 +21,7 @@ import org.eclipse.jetty.server.session.SessionHandler; import org.keycloak.adapters.jetty.spi.JettySessionManager; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java index 17246056c679..ddc2c9546d6c 100644 --- a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java +++ b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java @@ -24,7 +24,7 @@ import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.common.util.MultivaluedHashMap; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * @author Bill Burke diff --git a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java index 4ec71cd178b4..850f2222509c 100644 --- a/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java +++ b/adapters/saml/jetty/jetty9.4/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java @@ -25,7 +25,7 @@ import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.spi.HttpFacade; -import javax.servlet.ServletRequest; +import jakarta.servlet.ServletRequest; /** * @author Bill Burke diff --git a/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java b/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java index 731bdba26a35..cc5cc265bbe1 100755 --- a/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java +++ b/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java @@ -28,9 +28,9 @@ import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.common.util.KeycloakUriBuilder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpSession; import java.util.LinkedList; import java.util.List; import java.util.Set; diff --git a/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java b/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java index 093f203d5311..45fc8d8f5cc9 100755 --- a/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java +++ b/adapters/saml/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java @@ -37,16 +37,16 @@ import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.saml.common.exceptions.ParsingException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java index a7b8f41fd021..c46e9bcaff54 100755 --- a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java +++ b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java @@ -34,10 +34,10 @@ import org.keycloak.adapters.tomcat.PrincipalFactory; import org.keycloak.saml.common.exceptions.ParsingException; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java index ff122ac5a66c..c730f967f4ef 100755 --- a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java +++ b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java @@ -29,7 +29,7 @@ import org.keycloak.adapters.tomcat.PrincipalFactory; import org.keycloak.common.util.KeycloakUriBuilder; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.util.LinkedList; import java.util.List; diff --git a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/IdMapperUpdaterSessionListener.java b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/IdMapperUpdaterSessionListener.java index 4fc78149fd38..eb03f8740bb0 100644 --- a/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/IdMapperUpdaterSessionListener.java +++ b/adapters/saml/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/IdMapperUpdaterSessionListener.java @@ -19,7 +19,7 @@ import org.keycloak.adapters.spi.SessionIdMapper; import java.util.Objects; -import javax.servlet.http.*; +import jakarta.servlet.http.*; /** * diff --git a/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java b/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java index 58c041091fc1..c57581da0adc 100755 --- a/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java +++ b/adapters/saml/tomcat/tomcat/src/main/java/org/keycloak/adapters/saml/tomcat/SamlAuthenticatorValve.java @@ -28,7 +28,7 @@ import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.tomcat.GenericPrincipalFactory; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Method; import java.security.Principal; diff --git a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/SamlServletExtension.java b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/SamlServletExtension.java index 931ecd7169ea..16ad990fb7ad 100755 --- a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/SamlServletExtension.java +++ b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/SamlServletExtension.java @@ -41,7 +41,7 @@ import org.keycloak.adapters.undertow.UndertowUserSessionManagement; import org.keycloak.saml.common.exceptions.ParsingException; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java index df1a471b070b..0cc3dbb4aa0d 100755 --- a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java +++ b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java @@ -31,10 +31,10 @@ import org.keycloak.adapters.undertow.UndertowUserSessionManagement; import io.undertow.servlet.api.DeploymentInfo; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import java.io.IOException; import java.lang.reflect.*; import java.util.Map; diff --git a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java index 449a876c77bc..89a4373994fb 100755 --- a/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java +++ b/adapters/saml/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java @@ -38,9 +38,9 @@ import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.XMLGregorianCalendar; import java.security.Principal; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java index d65d74a3085f..475814dcc943 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java @@ -20,11 +20,11 @@ import org.keycloak.adapters.spi.SessionIdMapper; import java.util.Objects; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionAttributeListener; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionAttributeListener; +import jakarta.servlet.http.HttpSessionBindingEvent; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import org.jboss.logging.Logger; /** diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java index 5ece449657bb..7c2fa22d4f5a 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java @@ -22,9 +22,9 @@ import java.io.FileNotFoundException; import java.io.InputStream; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import org.jboss.logging.Logger; import org.keycloak.adapters.saml.AdapterConstants; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java index 5f9beb653440..7cd211510f0b 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java @@ -22,7 +22,7 @@ import java.util.regex.Pattern; import javax.security.auth.callback.CallbackHandler; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.jboss.logging.Logger; import org.keycloak.adapters.saml.SamlAuthenticator; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java index 093a85d38dcb..0f2120c68d2a 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java @@ -23,7 +23,7 @@ import java.util.*; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.Configuration; diff --git a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java index 5e822edfce3b..50cb9b72b336 100755 --- a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java +++ b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java @@ -24,7 +24,7 @@ import org.keycloak.common.util.UriUtils; import javax.security.cert.X509Certificate; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.IOException; @@ -109,8 +109,8 @@ public String getQueryParamValue(String paramName) { @Override public Cookie getCookie(String cookieName) { if (request.getCookies() == null) return null; - javax.servlet.http.Cookie cookie = null; - for (javax.servlet.http.Cookie c : request.getCookies()) { + jakarta.servlet.http.Cookie cookie = null; + for (jakarta.servlet.http.Cookie c : request.getCookies()) { if (c.getName().equals(cookieName)) { cookie = c; break; @@ -210,7 +210,7 @@ public void resetCookie(String name, String path) { @Override public void setCookie(String name, String value, String path, String domain, int maxAge, boolean secure, boolean httpOnly) { - javax.servlet.http.Cookie cookie = new javax.servlet.http.Cookie(name, value); + jakarta.servlet.http.Cookie cookie = new jakarta.servlet.http.Cookie(name, value); if (domain != null) cookie.setDomain(domain); if (path != null) cookie.setPath(path); if (secure) cookie.setSecure(true); diff --git a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettySessionManager.java b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettySessionManager.java index 645ce1f48c79..e4a9b5174eb5 100644 --- a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettySessionManager.java +++ b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettySessionManager.java @@ -17,7 +17,7 @@ package org.keycloak.adapters.jetty.spi; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; /** * @author Marek Posolda diff --git a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java index 55ebd32c9281..02941391bd9c 100755 --- a/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java +++ b/adapters/spi/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java @@ -20,7 +20,7 @@ import org.jboss.logging.Logger; import org.keycloak.adapters.spi.UserSessionManagement; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.util.List; /** diff --git a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java index f2b5a47a34f2..b519d59d3f4e 100755 --- a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java +++ b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java @@ -23,11 +23,11 @@ import org.keycloak.common.util.Encode; import org.keycloak.common.util.MultivaluedHashMap; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpSession; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java index add26e1c04c6..b3d30f45b0cb 100755 --- a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java +++ b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java @@ -25,8 +25,8 @@ import org.keycloak.common.util.UriUtils; import javax.security.cert.X509Certificate; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.IOException; @@ -111,8 +111,8 @@ public MultivaluedHashMap getQueryParameters() { @Override public Cookie getCookie(String cookieName) { if (request.getCookies() == null) return null; - javax.servlet.http.Cookie cookie = null; - for (javax.servlet.http.Cookie c : request.getCookies()) { + jakarta.servlet.http.Cookie cookie = null; + for (jakarta.servlet.http.Cookie c : request.getCookies()) { if (c.getName().equals(cookieName)) { cookie = c; break; diff --git a/adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java b/adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java index 7ff1fbceb635..87a5e3a0c455 100755 --- a/adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java +++ b/adapters/spi/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java @@ -25,7 +25,7 @@ import org.keycloak.common.util.UriUtils; import javax.security.cert.X509Certificate; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedInputStream; import java.io.IOException; @@ -117,8 +117,8 @@ public String getQueryParamValue(String paramName) { @Override public Cookie getCookie(String cookieName) { if (request.getCookies() == null) return null; - javax.servlet.http.Cookie cookie = null; - for (javax.servlet.http.Cookie c : request.getCookies()) { + jakarta.servlet.http.Cookie cookie = null; + for (jakarta.servlet.http.Cookie c : request.getCookies()) { if (c.getName().equals(cookieName)) { cookie = c; break; diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java index 0d4aae71614a..478fd275ca5b 100755 --- a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java +++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SavedRequest.java @@ -22,7 +22,7 @@ import io.undertow.servlet.handlers.ServletRequestContext; import io.undertow.servlet.spec.HttpSessionImpl; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSession; import java.io.Serializable; import java.security.AccessController; diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java index fbcd6d3219ce..c89f7e9e579b 100755 --- a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java +++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java @@ -22,8 +22,8 @@ import org.keycloak.adapters.spi.AuthenticationError; import org.keycloak.adapters.spi.LogoutError; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Bill Burke diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java index 497f772c31b0..c406751d41db 100755 --- a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java +++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java @@ -33,10 +33,10 @@ import org.keycloak.common.util.KeycloakUriBuilder; import javax.security.cert.X509Certificate; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java b/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java index 2805cc2c9201..bb602e196fc6 100644 --- a/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java +++ b/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java @@ -17,7 +17,7 @@ package org.keycloak.common.util; -import javax.activation.MimetypesFileTypeMap; +import jakarta.activation.MimetypesFileTypeMap; import java.io.File; /** diff --git a/examples/kerberos/src/main/java/org/keycloak/example/kerberos/GSSCredentialsClient.java b/examples/kerberos/src/main/java/org/keycloak/example/kerberos/GSSCredentialsClient.java index 7a9f3e208440..e28005ebc8f7 100644 --- a/examples/kerberos/src/main/java/org/keycloak/example/kerberos/GSSCredentialsClient.java +++ b/examples/kerberos/src/main/java/org/keycloak/example/kerberos/GSSCredentialsClient.java @@ -29,7 +29,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; import javax.security.sasl.Sasl; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Hashtable; /** diff --git a/examples/ldap/src/main/java/org/keycloak/example/ldap/LDAPPictureServlet.java b/examples/ldap/src/main/java/org/keycloak/example/ldap/LDAPPictureServlet.java index fe5a98364331..688556255f86 100644 --- a/examples/ldap/src/main/java/org/keycloak/example/ldap/LDAPPictureServlet.java +++ b/examples/ldap/src/main/java/org/keycloak/example/ldap/LDAPPictureServlet.java @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.List; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.keycloak.KeycloakSecurityContext; import org.keycloak.common.util.Base64; diff --git a/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionAuthenticator.java b/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionAuthenticator.java index 085b96a9d552..e91d72389af1 100755 --- a/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionAuthenticator.java +++ b/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionAuthenticator.java @@ -32,9 +32,9 @@ import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.Collections; import java.util.List; diff --git a/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionRequiredAction.java b/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionRequiredAction.java index 80edf50b8c2b..1463ed629cdc 100755 --- a/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionRequiredAction.java +++ b/examples/providers/authenticator/src/main/java/org/keycloak/examples/authenticator/SecretQuestionRequiredAction.java @@ -23,7 +23,7 @@ import org.keycloak.credential.CredentialProvider; import org.keycloak.examples.authenticator.credential.SecretQuestionCredentialModel; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * @author Bill Burke diff --git a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/jpa/Company.java b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/jpa/Company.java index bca8e1d78a2a..a8cb97a2f0f0 100644 --- a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/jpa/Company.java +++ b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/jpa/Company.java @@ -18,12 +18,12 @@ package org.keycloak.examples.domainextension.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @Entity @Table(name = "EXAMPLE_COMPANY") diff --git a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/CompanyResource.java b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/CompanyResource.java index 7f9d7aaaa0d7..ad47e418380e 100644 --- a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/CompanyResource.java +++ b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/CompanyResource.java @@ -5,14 +5,14 @@ import org.keycloak.examples.domainextension.spi.ExampleService; import org.keycloak.models.KeycloakSession; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; public class CompanyResource { diff --git a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/ExampleRestResource.java b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/ExampleRestResource.java index 3e4ceeb24c1c..dc439a734ef6 100644 --- a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/ExampleRestResource.java +++ b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/ExampleRestResource.java @@ -4,9 +4,9 @@ import org.keycloak.services.managers.AppAuthManager; import org.keycloak.services.managers.AuthenticationManager; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.Path; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.Path; public class ExampleRestResource { diff --git a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/spi/impl/ExampleServiceImpl.java b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/spi/impl/ExampleServiceImpl.java index dd79fd02d063..55cd876379c2 100644 --- a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/spi/impl/ExampleServiceImpl.java +++ b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/spi/impl/ExampleServiceImpl.java @@ -25,7 +25,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.LinkedList; import java.util.List; diff --git a/examples/providers/rest/src/main/java/org/keycloak/examples/rest/HelloResourceProvider.java b/examples/providers/rest/src/main/java/org/keycloak/examples/rest/HelloResourceProvider.java index ebd8d1c9916e..6757a60ed436 100644 --- a/examples/providers/rest/src/main/java/org/keycloak/examples/rest/HelloResourceProvider.java +++ b/examples/providers/rest/src/main/java/org/keycloak/examples/rest/HelloResourceProvider.java @@ -20,8 +20,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.services.resource.RealmResourceProvider; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; /** * @author Stian Thorgersen diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java index 8ed54e7aa350..b2f86aa082b2 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java @@ -26,12 +26,12 @@ import org.keycloak.services.managers.LDAPServerCapabilitiesManager; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Set; /** @@ -70,7 +70,7 @@ public LdapServerCapabilitiesResource(KeycloakSession session, AdminPermissionEv @POST @NoCache @Consumes(MediaType.APPLICATION_JSON) - @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON) + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) public Response ldapServerCapabilities(TestLdapConnectionRepresentation config) { auth.realm().requireManageRealm(); try { diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java index 34b069747001..058ff652f561 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java @@ -27,11 +27,11 @@ import org.keycloak.services.managers.LDAPServerCapabilitiesManager; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * @resource User Storage Provider diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java index 589bec338e6c..eb446b7d1eff 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java @@ -1,7 +1,7 @@ package org.keycloak.admin.client; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientBuilder; public class ClientBuilderWrapper { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java index 9596b225b8f5..1111783965b1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java @@ -16,8 +16,8 @@ */ package org.keycloak.admin.client; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import java.net.URI; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java index d9338fb84a57..3415791e8d0b 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java @@ -16,7 +16,7 @@ */ package org.keycloak.admin.client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.keycloak.admin.client.resource.BearerAuthFilter; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.RealmsResource; @@ -25,7 +25,7 @@ import org.keycloak.admin.client.token.TokenManager; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; import java.net.URI; import java.util.Iterator; import java.util.ServiceLoader; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java index c7c33994371d..ca146e1a163a 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java @@ -20,11 +20,11 @@ import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS; import static org.keycloak.OAuth2Constants.PASSWORD; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; /** * Provides a {@link Keycloak} client builder with the ability to customize the underlying - * {@link javax.ws.rs.client.Client RESTEasy client} used to communicate with the Keycloak server. + * {@link jakarta.ws.rs.client.Client RESTEasy client} used to communicate with the Keycloak server. *

*

Example usage with a connection pool size of 20:

* 
@@ -50,7 +50,7 @@
  *
* * @author Scott Rossillo - * @see javax.ws.rs.client.Client + * @see jakarta.ws.rs.client.Client */ public class KeycloakBuilder { private String serverUrl; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java index 0c1f0664b11d..66dd2ad8a5e1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java index 695afc384aa6..1b4a2ca92f56 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java @@ -18,13 +18,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java index 1168bc0f8bf7..1aee3f3aa202 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java @@ -17,12 +17,12 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.Map; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java index b549f4905014..10292c763a29 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java @@ -26,16 +26,16 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java index de8d958ab7ae..6085632bb114 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java @@ -18,14 +18,14 @@ import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java index f4750b6b6cf6..72e9dd050d82 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java @@ -17,9 +17,9 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; import java.io.IOException; import org.keycloak.common.util.Base64; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java index 0d4992fcfc1c..6d9527e4fb64 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java @@ -19,11 +19,11 @@ import org.keycloak.admin.client.token.TokenManager; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.core.HttpHeaders; import java.io.IOException; import java.util.List; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java index 3934975f58ac..02e47e6e53bd 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java @@ -20,12 +20,12 @@ import org.keycloak.representations.KeyStoreConfig; import org.keycloak.representations.idm.CertificateRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java index 54dba868b146..8594d2eebad3 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java @@ -20,14 +20,14 @@ import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; import org.keycloak.representations.idm.ClientInitialAccessPresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java index 66b683ba7931..3daee1b33e8c 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java @@ -1,10 +1,10 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.ClientPoliciesRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java index 6c71dcecba26..fe3b61192697 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java @@ -1,11 +1,11 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.ClientProfilesRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java index 72c35c202892..d4be914c3cce 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java index 5f330d3dfefc..15409081b918 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java @@ -18,13 +18,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java index 9d6f41cae80a..bff3cc100dff 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java @@ -19,10 +19,10 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.ComponentTypeRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java index 4097c5ed87ee..7e7ce97a80e8 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java @@ -20,16 +20,16 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.adapters.action.GlobalRequestResult; import org.keycloak.representations.idm.ClientRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java index 3d753c20e80e..273508bfc1a1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java @@ -16,14 +16,14 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.ClientScopePolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java index 11fbf5e73f46..04f7654f2178 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java @@ -19,13 +19,13 @@ import org.keycloak.representations.idm.ClientScopeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java index 2df8978d43e1..203525b3c6df 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java @@ -19,14 +19,14 @@ import org.keycloak.representations.idm.ClientScopeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java index 8cec12eef580..ca9a6cad10b8 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java @@ -19,15 +19,15 @@ import org.keycloak.representations.idm.ClientRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java index 7fc040fd276a..5346e4faa860 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java @@ -21,14 +21,14 @@ import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.ComponentTypeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; /** * @author Bill Burke diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java index 235b34c845d1..96c630fbc670 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java @@ -18,16 +18,16 @@ import org.keycloak.representations.idm.ComponentRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java index 071cfcf8921d..be10893de055 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java index 971349380412..697a35f38ca0 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java @@ -18,13 +18,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java index 1075f0486d1b..4048218f7f59 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java @@ -22,16 +22,16 @@ import org.keycloak.representations.idm.ManagementPermissionRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java index 422709c66f8f..671e25c1088d 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java @@ -19,9 +19,9 @@ import org.keycloak.representations.idm.GroupRepresentation; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java index a2a3e45dbe7a..c16a0fe9cef1 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java @@ -21,17 +21,17 @@ import org.keycloak.representations.idm.IdentityProviderMapperTypeRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java index ebc31339c8b6..22fe76a01c0c 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java @@ -19,14 +19,14 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java index 62daa38475d0..7b4780e1feb0 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.JSPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java index 78caa3961784..7059856b3fa5 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java @@ -18,13 +18,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.JSPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java index aeb1fdb5af71..40b3f6687953 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java @@ -19,9 +19,9 @@ import org.keycloak.representations.idm.KeysMetadataRepresentation; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java index 679137bda978..3de81d73fdc4 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java @@ -16,7 +16,7 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java index 9eed5e99067a..b9dace649a98 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java @@ -21,15 +21,15 @@ import org.keycloak.representations.idm.authorization.PolicyProviderRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java index 00550230fbf5..6a8d746502c5 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java @@ -18,14 +18,14 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java index d7dd1419e0c1..ee7bbb0921d2 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java @@ -19,15 +19,15 @@ import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java index b26dc7fb6efc..d98768b4f949 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java @@ -20,16 +20,16 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; public interface RealmLocalizationResource { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java index 40293fb70b4f..99e1fa662375 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java @@ -29,18 +29,18 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.TestLdapConnectionRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; @@ -230,7 +230,7 @@ Response testLDAPConnection(@FormParam("action") String action, @FormParam("conn @POST @Path("ldap-server-capabilities") @Consumes(MediaType.APPLICATION_JSON) - @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON) + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) List ldapServerCapabilities(TestLdapConnectionRepresentation config); @Path("testSMTPConnection") diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java index d20be9f8cc39..9b0adf2d637e 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java @@ -19,13 +19,13 @@ import org.keycloak.representations.idm.RealmRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java index 10574e21d0a4..fef3c57641d1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java @@ -16,11 +16,11 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.RegexPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java index f2bb6d8cfa4d..4671c8e93061 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java @@ -18,13 +18,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java index e77377bdb717..f94d01c7f62b 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java index 9c3a73ea8a67..49cd2e2eb998 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java @@ -21,13 +21,13 @@ import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java index 60efbf6ad786..276a53eb117a 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java @@ -21,13 +21,13 @@ import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java index 7e3f2d117939..2746e9e29583 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java @@ -18,15 +18,15 @@ import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java index dcf05a0c63d1..0be045759b43 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java @@ -18,15 +18,15 @@ import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java index b594dbc4754d..0de55c09853f 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java @@ -19,16 +19,16 @@ import org.keycloak.representations.idm.RoleRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import java.util.List; import java.util.Set; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java index bb68f21938fd..e25fe13c6283 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java @@ -19,12 +19,12 @@ import org.keycloak.representations.idm.MappingsRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java index be834f39f207..86c025deae62 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.RolePolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java index b3be353f09fe..bc98fb1f721a 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java @@ -18,13 +18,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java index f5604c51af32..351a32470145 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java @@ -23,16 +23,16 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import java.util.List; import java.util.Set; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java index cfba5e76e1f5..3e59b386c95a 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java @@ -19,15 +19,15 @@ import org.keycloak.representations.idm.RoleRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java index 4547a93e59b3..f76f9ae35486 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java @@ -19,16 +19,16 @@ import org.keycloak.representations.idm.RoleRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java index 99fa30b3e75e..cb0d9d3af5f6 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java @@ -18,13 +18,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java index e130960e509d..d38df84c4dd9 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java index 61bc6eef7503..abbb4e92d5b1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java @@ -19,10 +19,10 @@ import org.keycloak.representations.info.ServerInfoRepresentation; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author Stian Thorgersen diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java index 5bc03e03fb05..919c1d528043 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.TimePolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java index acad51a686c8..2184c63771e8 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java @@ -18,13 +18,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java index b5f7f74d25d0..3d019d8e25be 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java index 7856378642f4..8e33486c8b9f 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java @@ -18,13 +18,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java index a9475a058f85..b6fab1aa7baf 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java @@ -16,12 +16,12 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * @author Vlastimil Elias diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java index 15cb0bed6b55..5198ea78f09c 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java @@ -23,18 +23,18 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; @@ -137,7 +137,7 @@ List groups(@QueryParam("search") String search, * Update a credential label for a user */ @PUT - @Consumes(javax.ws.rs.core.MediaType.TEXT_PLAIN) + @Consumes(jakarta.ws.rs.core.MediaType.TEXT_PLAIN) @Path("credentials/{credentialId}/userLabel") void setCredentialUserLabel(final @PathParam("credentialId") String credentialId, String userLabel); diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java index d382007b30ea..8b38dfd9d41d 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java @@ -18,12 +18,12 @@ import org.keycloak.representations.idm.SynchronizationResultRepresentation; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; /** * @author Bill Burke diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java index 481516293cd1..0616e6b878ad 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java @@ -19,16 +19,16 @@ import org.keycloak.representations.idm.UserRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; public interface UsersResource { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java index f5df72ded09b..7c69e2e4057e 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java @@ -18,9 +18,9 @@ package org.keycloak.admin.client.spi; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.keycloak.admin.client.ClientBuilderWrapper; import org.keycloak.admin.client.JacksonProvider; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java index ebc602034b6c..353928640b3b 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java @@ -18,8 +18,8 @@ package org.keycloak.admin.client.spi; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; /** * An SPI for using the JAX-RS Client API regardless of the underlying stack. @@ -29,7 +29,7 @@ public interface ResteasyClientProvider { /** * Creates a new {@link Client}. * - * @param messageHandler a {@link javax.ws.rs.ext.MessageBodyReader} and/or {@link javax.ws.rs.ext.MessageBodyWriter} instance. + * @param messageHandler a {@link jakarta.ws.rs.ext.MessageBodyReader} and/or {@link jakarta.ws.rs.ext.MessageBodyWriter} instance. * @param sslContext an optional {@link SSLContext} * @param disableTrustManager if the client should not validate the server certificates when using TLS * @return diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java index 38c854703419..b01c6d000bf5 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.token; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.keycloak.admin.client.Config; @@ -26,9 +26,9 @@ import org.keycloak.common.util.Time; import org.keycloak.representations.AccessTokenResponse; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.Form; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Form; import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS; import static org.keycloak.OAuth2Constants.CLIENT_ID; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java index 91a921fc8772..c2f2010b75f5 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java @@ -19,13 +19,13 @@ import org.keycloak.representations.AccessTokenResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/misc/keycloak-test-helper/src/main/java/org/keycloak/test/FluentTestsHelper.java b/misc/keycloak-test-helper/src/main/java/org/keycloak/test/FluentTestsHelper.java index 94a140c9d446..494a3e05eff2 100644 --- a/misc/keycloak-test-helper/src/main/java/org/keycloak/test/FluentTestsHelper.java +++ b/misc/keycloak-test-helper/src/main/java/org/keycloak/test/FluentTestsHelper.java @@ -28,8 +28,8 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; diff --git a/misc/keycloak-test-helper/src/main/java/org/keycloak/test/TestsHelper.java b/misc/keycloak-test-helper/src/main/java/org/keycloak/test/TestsHelper.java index 1378719660e4..e858209612d4 100644 --- a/misc/keycloak-test-helper/src/main/java/org/keycloak/test/TestsHelper.java +++ b/misc/keycloak-test-helper/src/main/java/org/keycloak/test/TestsHelper.java @@ -36,8 +36,8 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.test.builders.ClientBuilder; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.io.InputStream; import java.net.URI; diff --git a/model/infinispan/src/test/java/org/keycloak/models/sessions/infinispan/initializer/ConcurrencyVersioningTest.java b/model/infinispan/src/test/java/org/keycloak/models/sessions/infinispan/initializer/ConcurrencyVersioningTest.java index d107de5c67ee..92e77a7a6ff7 100755 --- a/model/infinispan/src/test/java/org/keycloak/models/sessions/infinispan/initializer/ConcurrencyVersioningTest.java +++ b/model/infinispan/src/test/java/org/keycloak/models/sessions/infinispan/initializer/ConcurrencyVersioningTest.java @@ -16,9 +16,9 @@ import org.junit.Test; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; -import javax.transaction.NotSupportedException; -import javax.transaction.Status; -import javax.transaction.SystemException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PermissionTicketEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PermissionTicketEntity.java index cd23477d2af8..51ec18a763ca 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PermissionTicketEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PermissionTicketEntity.java @@ -17,18 +17,18 @@ package org.keycloak.authorization.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * @author Pedro Igor diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java index 46f76a69b900..d7c5d252c545 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java @@ -20,23 +20,23 @@ import java.util.*; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Fetch; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceAttributeEntity.java index 19963dc3afb6..2cae29bfe1ef 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceAttributeEntity.java @@ -16,17 +16,17 @@ */ package org.keycloak.authorization.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Pedro Igor diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java index 0546c510b9c6..7ca7274e9ffb 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java @@ -18,24 +18,24 @@ package org.keycloak.authorization.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import java.util.ArrayList; import java.util.Collection; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceServerEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceServerEntity.java index 43ee896147ad..ed92c62ad2bd 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceServerEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceServerEntity.java @@ -21,10 +21,10 @@ import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.PolicyEnforcementMode; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Pedro Igor diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ScopeEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ScopeEntity.java index be42bdc2a929..3a2f409828c6 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ScopeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ScopeEntity.java @@ -18,20 +18,20 @@ package org.keycloak.authorization.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import java.util.LinkedList; import java.util.List; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAAuthorizationStoreFactory.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAAuthorizationStoreFactory.java index 84a43513904b..e6e8fb211c68 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAAuthorizationStoreFactory.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAAuthorizationStoreFactory.java @@ -18,7 +18,7 @@ package org.keycloak.authorization.jpa.store; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.Config; import org.keycloak.authorization.AuthorizationProvider; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java index 9a49eecce821..09ba6ff9564a 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java @@ -24,13 +24,13 @@ import java.util.Map; import java.util.Objects; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.jpa.entities.PermissionTicketEntity; @@ -43,7 +43,7 @@ import org.keycloak.common.util.Time; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPolicyStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPolicyStore.java index e41b57271589..f96cb313113e 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPolicyStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPolicyStore.java @@ -25,14 +25,14 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.jpa.entities.PolicyEntity; @@ -46,7 +46,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentation; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceServerStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceServerStore.java index e484c6d12f72..6ad89649d4fe 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceServerStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceServerStore.java @@ -29,8 +29,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.storage.StorageId; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import java.util.List; import org.keycloak.models.ClientModel; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceStore.java index 3fc03c9837fe..62e2c1290c89 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceStore.java @@ -27,15 +27,15 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAScopeStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAScopeStore.java index b0114fb7617b..808d722eb948 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAScopeStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAScopeStore.java @@ -21,14 +21,14 @@ import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.jpa.entities.ScopeEntity; @@ -38,7 +38,7 @@ import org.keycloak.authorization.store.ScopeStore; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAStoreFactory.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAStoreFactory.java index b78a4711716c..9764bcfe21d1 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAStoreFactory.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAStoreFactory.java @@ -18,7 +18,7 @@ package org.keycloak.authorization.jpa.store; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.store.PermissionTicketStore; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PermissionTicketAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PermissionTicketAdapter.java index dcbf0e77a9ae..5ce8e835e5ef 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PermissionTicketAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PermissionTicketAdapter.java @@ -18,7 +18,7 @@ import static org.keycloak.authorization.UserManagedPermissionUtil.updatePolicy; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.authorization.jpa.entities.PermissionTicketEntity; import org.keycloak.authorization.jpa.entities.PolicyEntity; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PolicyAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PolicyAdapter.java index c0fa4166de94..b69387945578 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PolicyAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PolicyAdapter.java @@ -30,7 +30,7 @@ import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.Logic; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceAdapter.java index 6ca025c27b27..6303174ec14d 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceAdapter.java @@ -29,8 +29,8 @@ import org.keycloak.models.jpa.JpaModel; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import java.util.ArrayList; import java.util.Collections; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceServerAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceServerAdapter.java index 9e58a50fa2e2..e17ca2199eb4 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceServerAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceServerAdapter.java @@ -25,7 +25,7 @@ import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.PolicyEnforcementMode; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ScopeAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ScopeAdapter.java index 1e7391d04ba4..a1d2c467a9d0 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ScopeAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ScopeAdapter.java @@ -24,7 +24,7 @@ import org.keycloak.authorization.store.StoreFactory; import org.keycloak.models.jpa.JpaModel; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java index e35e5b07346f..e0b4394fcf5b 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java @@ -19,7 +19,7 @@ import org.jboss.logging.Logger; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * @author Stian Thorgersen diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java index ea612bb9130a..b602ca722c74 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java @@ -43,12 +43,12 @@ import org.keycloak.transaction.JtaTransactionManagerLookup; import javax.naming.InitialContext; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.SynchronizationType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.SynchronizationType; import javax.sql.DataSource; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import java.io.File; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java index ee99455ec0c7..cc424ae06b99 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java @@ -27,7 +27,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.timer.ScheduledTask; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/JndiEntityManagerLookup.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JndiEntityManagerLookup.java index d2f5e48069a6..a689bff50c76 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/JndiEntityManagerLookup.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/JndiEntityManagerLookup.java @@ -18,8 +18,8 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.keycloak.models.KeycloakSession; /** diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java index 3d527b6e378d..ec3797b1f8ed 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java @@ -19,7 +19,7 @@ import org.keycloak.provider.Provider; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * @author Stian Thorgersen diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaExceptionConverter.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaExceptionConverter.java index 00d139570819..5b50eab34141 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaExceptionConverter.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaExceptionConverter.java @@ -20,7 +20,7 @@ import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ExceptionConverter; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java index c8212f4d63c1..3b3ef2ccf201 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java @@ -20,8 +20,8 @@ import org.jboss.logging.Logger; import org.keycloak.models.KeycloakTransaction; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceException; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java index 7749f26b4531..df8954227342 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/PersistenceExceptionConverter.java @@ -23,8 +23,8 @@ import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ModelException; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java index 169ac0dcb3a2..a7b3b234cba6 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java @@ -28,9 +28,9 @@ import org.keycloak.utils.ProxyClassLoader; import org.keycloak.models.KeycloakSession; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java b/model/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java index e01cf9a2bc14..f5be1d5d029f 100644 --- a/model/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java +++ b/model/jpa/src/main/java/org/keycloak/events/jpa/AdminEventEntity.java @@ -17,10 +17,10 @@ package org.keycloak.events.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Giriraj Sharma diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java b/model/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java index 0f7347fc6681..1e26a486dac3 100644 --- a/model/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java +++ b/model/jpa/src/main/java/org/keycloak/events/jpa/EventEntity.java @@ -17,10 +17,10 @@ package org.keycloak.events.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Stian Thorgersen diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java index f51d53b05882..b5fed1fad79c 100755 --- a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java +++ b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java @@ -22,13 +22,13 @@ import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import java.util.ArrayList; import java.util.Date; import java.util.LinkedList; diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java index 6e504f8ad8eb..fe9eab8732af 100644 --- a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java +++ b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java @@ -21,12 +21,12 @@ import org.keycloak.events.EventQuery; import org.keycloak.events.EventType; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import java.util.ArrayList; import java.util.Date; import java.util.LinkedList; diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java index dc8f0e500d9f..e1a1690f7ddf 100755 --- a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java +++ b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java @@ -36,8 +36,8 @@ import org.keycloak.models.jpa.entities.RealmEntity; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import java.io.IOException; import java.util.HashMap; import java.util.List; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java index 389904341a92..5469dada44e1 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java @@ -30,7 +30,7 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RoleUtils; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.security.MessageDigest; import java.util.Collections; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientScopeAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientScopeAdapter.java index ab5d4b330827..9064a35f2b10 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientScopeAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientScopeAdapter.java @@ -30,7 +30,7 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RoleUtils; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.HashMap; import java.util.Iterator; import java.util.Map; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java index 77a71ac60057..5fd5b23e41df 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java @@ -28,15 +28,15 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RoleUtils; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Stream; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientProviderFactory.java index b6794a3815c8..5276a2204ef7 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientProviderFactory.java @@ -25,7 +25,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.protocol.saml.SamlConfigAttributes; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientScopeProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientScopeProviderFactory.java index 23afcfe9cb70..bfb1ee2f26cc 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientScopeProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientScopeProviderFactory.java @@ -24,7 +24,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaDeploymentStateProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaDeploymentStateProviderFactory.java index 8d3c51967bf1..a3ce6af3425d 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaDeploymentStateProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaDeploymentStateProviderFactory.java @@ -17,7 +17,7 @@ package org.keycloak.models.jpa; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaGroupProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaGroupProviderFactory.java index bed342864150..f01b20695a2f 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaGroupProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaGroupProviderFactory.java @@ -24,7 +24,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java index 1d5dba4d87c8..5fc124603a46 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java @@ -30,15 +30,15 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.jboss.logging.Logger; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java index 5a5eb00f2b16..1fdddd4e3b22 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java @@ -23,7 +23,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmProviderFactory; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RealmProvider; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRoleProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRoleProviderFactory.java index a7ae5604cbf4..5f614b1b44f2 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRoleProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRoleProviderFactory.java @@ -24,7 +24,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStore.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStore.java index dd6fe4c18266..f470b171631a 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStore.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStore.java @@ -27,11 +27,11 @@ import org.keycloak.models.jpa.entities.UserEntity; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import java.util.List; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import java.util.Objects; import java.util.stream.Collectors; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStoreFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStoreFactory.java index ccc374dbcdc7..ed976352b004 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStoreFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStoreFactory.java @@ -24,7 +24,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderFactory; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java index 51fcb12114aa..3ccd00ac12d1 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java @@ -49,18 +49,18 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.client.ClientStorageProvider; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.From; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.From; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProviderFactory.java index a6be0c07476e..e80553952d63 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProviderFactory.java @@ -24,7 +24,7 @@ import org.keycloak.models.UserProvider; import org.keycloak.models.UserProviderFactory; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/MigrationModelAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/MigrationModelAdapter.java index 778279d75809..4f7a9605b869 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/MigrationModelAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/MigrationModelAdapter.java @@ -21,8 +21,8 @@ import org.keycloak.migration.MigrationModel; import org.keycloak.models.jpa.entities.MigrationModelEntity; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import java.security.SecureRandom; import java.util.List; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/PaginationUtils.java b/model/jpa/src/main/java/org/keycloak/models/jpa/PaginationUtils.java index 715539642bc0..f52014acf1fa 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/PaginationUtils.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/PaginationUtils.java @@ -17,7 +17,7 @@ package org.keycloak.models.jpa; -import javax.persistence.TypedQuery; +import jakarta.persistence.TypedQuery; public class PaginationUtils { diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/PersistenceExceptionConverter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/PersistenceExceptionConverter.java index f25c7b4bd354..398408bf58b1 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/PersistenceExceptionConverter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/PersistenceExceptionConverter.java @@ -21,8 +21,8 @@ import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ModelException; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java index 12e4148c874f..919cb8e323b6 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java @@ -32,9 +32,9 @@ import org.keycloak.models.utils.ComponentUtil; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; import java.util.*; import java.util.function.Predicate; import java.util.stream.Stream; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java index c46a0389918a..d56f55fd9375 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java @@ -25,8 +25,8 @@ import org.keycloak.models.jpa.entities.RoleEntity; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java index 9b3c9c695af4..e595c9d85b82 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java @@ -35,14 +35,14 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RoleUtils; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/converter/MapStringConverter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/converter/MapStringConverter.java index 05ca0aabc8fc..7d2ae840ea4f 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/converter/MapStringConverter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/converter/MapStringConverter.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Map; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.jboss.logging.Logger; import org.keycloak.util.JsonSerialization; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationExecutionEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationExecutionEntity.java index 70c438cf57b0..206f06f41aee 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationExecutionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationExecutionEntity.java @@ -19,17 +19,17 @@ import org.keycloak.models.AuthenticationExecutionModel; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationFlowEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationFlowEntity.java index 20b7902c922f..4790eb13138a 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationFlowEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationFlowEntity.java @@ -19,17 +19,17 @@ import org.hibernate.annotations.Nationalized; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.Collection; import java.util.LinkedList; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticatorConfigEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticatorConfigEntity.java index a07e7ac5513a..095a0673494c 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticatorConfigEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticatorConfigEntity.java @@ -17,20 +17,20 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import java.util.Map; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.UniqueConstraint; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientAttributeEntity.java index 8b8557b5da0c..838a08b3c87f 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientAttributeEntity.java @@ -19,14 +19,14 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java index 16d78da42984..11523b61cfc3 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java @@ -19,21 +19,21 @@ import org.hibernate.annotations.Nationalized; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientInitialAccessEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientInitialAccessEntity.java index bdb510e7c491..f27b0078d93d 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientInitialAccessEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientInitialAccessEntity.java @@ -17,17 +17,17 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeAttributeEntity.java index 6be9991de9f6..e7c17e2a6221 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeAttributeEntity.java @@ -19,14 +19,14 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeClientMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeClientMappingEntity.java index 42a9610ffd20..6ee725f2c257 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeClientMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeClientMappingEntity.java @@ -19,13 +19,13 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * Binding between client and clientScope diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeEntity.java index f16d62955c60..576e8a26d088 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeEntity.java @@ -22,20 +22,20 @@ import java.util.LinkedList; import java.util.Set; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.Nationalized; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeRoleMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeRoleMappingEntity.java index cf5e95d66d97..2f0737193ace 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeRoleMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeRoleMappingEntity.java @@ -17,15 +17,15 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentConfigEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentConfigEntity.java index c5a22fd7fa44..c2a693760cef 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentConfigEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentConfigEntity.java @@ -19,15 +19,15 @@ import org.hibernate.annotations.Nationalized; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentEntity.java index 8857bc96b19f..29d0512358d2 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentEntity.java @@ -20,17 +20,17 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/CredentialEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/CredentialEntity.java index 698beaab38bc..9b05e3769620 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/CredentialEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/CredentialEntity.java @@ -17,20 +17,20 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Collection; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/DefaultClientScopeRealmMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/DefaultClientScopeRealmMappingEntity.java index c667b10ddf64..5f3a83b94aac 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/DefaultClientScopeRealmMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/DefaultClientScopeRealmMappingEntity.java @@ -19,16 +19,16 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * Binding between realm and default clientScope diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/FederatedIdentityEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/FederatedIdentityEntity.java index 88394d498221..6ddae247f429 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/FederatedIdentityEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/FederatedIdentityEntity.java @@ -17,16 +17,16 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupAttributeEntity.java index d762661b058a..08fcc899b002 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupAttributeEntity.java @@ -19,17 +19,17 @@ import org.hibernate.annotations.Nationalized; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java index e1ca4abb67bd..aaee40b95a65 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java @@ -19,7 +19,7 @@ import org.hibernate.annotations.Nationalized; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Collection; import java.util.LinkedList; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupRoleMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupRoleMappingEntity.java index 8ba16dc7db80..7446bb797ad4 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupRoleMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupRoleMappingEntity.java @@ -17,16 +17,16 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderEntity.java index e63b7f25e0f1..82032b755220 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderEntity.java @@ -17,20 +17,20 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.util.Map; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderMapperEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderMapperEntity.java index 7084fd202308..f55e5c5df864 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderMapperEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderMapperEntity.java @@ -17,18 +17,18 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import java.util.Map; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/MigrationModelEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/MigrationModelEntity.java index 5ba8bf68561d..02de1c2f417e 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/MigrationModelEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/MigrationModelEntity.java @@ -17,14 +17,14 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.util.Date; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java index 050f11456bd7..1335ce21b3d6 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java @@ -17,18 +17,18 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import java.util.Map; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmAttributeEntity.java index a015b9ba83f5..55f1e9330b79 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmAttributeEntity.java @@ -19,16 +19,16 @@ import org.hibernate.annotations.Nationalized; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java index 54b3fcde020c..dbf5ceedf145 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java @@ -17,22 +17,22 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKey; -import javax.persistence.MapKeyColumn; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmLocalizationTextsEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmLocalizationTextsEntity.java index 39a4c85a55eb..f76acd816fe2 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmLocalizationTextsEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmLocalizationTextsEntity.java @@ -20,12 +20,12 @@ import java.io.Serializable; import java.util.Map; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.keycloak.models.jpa.converter.MapStringConverter; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredActionProviderEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredActionProviderEntity.java index 02d618738286..edc8bdbaf33f 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredActionProviderEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredActionProviderEntity.java @@ -17,20 +17,20 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.util.Map; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentialEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentialEntity.java index 6a692f881615..cf54e8334f8d 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentialEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentialEntity.java @@ -17,14 +17,14 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleAttributeEntity.java index 59b88a4494cc..9414c0812cb6 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleAttributeEntity.java @@ -19,17 +19,17 @@ import org.hibernate.annotations.Nationalized; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Leon Graser diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java index 68c653236fc7..081bb52a53f2 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java @@ -22,21 +22,21 @@ import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.Nationalized; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import java.util.HashSet; import java.util.LinkedList; import java.util.List; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserAttributeEntity.java index fd211e437de4..79f548c72044 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserAttributeEntity.java @@ -19,17 +19,17 @@ import org.hibernate.annotations.Nationalized; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentClientScopeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentClientScopeEntity.java index fdccc0996255..2c5c8fb1d23a 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentClientScopeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentClientScopeEntity.java @@ -19,16 +19,16 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentEntity.java index 1e0a0f80e9f4..ecb967251984 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentEntity.java @@ -17,20 +17,20 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import java.util.Collection; import java.util.LinkedList; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java index e5cbcc5c00c5..5331204cca6b 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java @@ -23,17 +23,17 @@ import org.hibernate.annotations.Nationalized; import org.keycloak.models.utils.KeycloakModelUtils; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import java.util.Collection; import java.util.LinkedList; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationMapperEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationMapperEntity.java index 64ed5830871e..eef203bf4432 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationMapperEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationMapperEntity.java @@ -17,18 +17,18 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import java.util.Map; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationProviderEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationProviderEntity.java index 7e84f778bc42..8178fbcbcc5a 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationProviderEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationProviderEntity.java @@ -17,18 +17,18 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import java.util.Map; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserGroupMembershipEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserGroupMembershipEntity.java index 534646e8772b..9b9b5850c608 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserGroupMembershipEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserGroupMembershipEntity.java @@ -17,16 +17,16 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java index 4938be02e14e..02cc464b4b73 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java @@ -17,16 +17,16 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java index bc8768ba5845..d9e8979a9f03 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java @@ -17,16 +17,16 @@ package org.keycloak.models.jpa.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java index b552efe82fd6..1a6c8b9f2ef9 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java @@ -33,9 +33,9 @@ import org.keycloak.models.utils.SessionTimeoutHelper; import org.keycloak.storage.StorageId; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import java.util.Collection; import java.util.Collections; @@ -48,7 +48,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java index 70147b46195d..8c10926e716d 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java @@ -26,7 +26,7 @@ import org.keycloak.models.session.UserSessionPersisterProviderFactory; import org.keycloak.provider.EnvironmentDependentProviderFactory; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentClientSessionEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentClientSessionEntity.java index 86874e1fd94d..852489368460 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentClientSessionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentClientSessionEntity.java @@ -17,13 +17,13 @@ package org.keycloak.models.jpa.session; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentUserSessionEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentUserSessionEntity.java index 5dc21913af63..c711a47dc4f8 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentUserSessionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentUserSessionEntity.java @@ -19,13 +19,13 @@ import org.keycloak.storage.jpa.KeyUtils; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProvider.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProvider.java index 192aa3cc2195..d8c537455a77 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProvider.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProvider.java @@ -53,15 +53,15 @@ import org.keycloak.storage.jpa.entity.FederatedUserRequiredActionEntity.Key; import org.keycloak.storage.jpa.entity.FederatedUserRoleMappingEntity; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java index 2780393c9148..d6f60dd8b2fc 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java @@ -25,7 +25,7 @@ import org.keycloak.storage.federated.UserFederatedStorageProvider; import org.keycloak.storage.federated.UserFederatedStorageProviderFactory; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/BrokerLinkEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/BrokerLinkEntity.java index 585bb942a3b3..74149300f540 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/BrokerLinkEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/BrokerLinkEntity.java @@ -19,13 +19,13 @@ import org.keycloak.storage.jpa.KeyUtils; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUser.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUser.java index ebc1db06a98c..776f6f939493 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUser.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUser.java @@ -18,14 +18,14 @@ import org.keycloak.storage.jpa.KeyUtils; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserAttributeEntity.java index 6add6b21fdaa..dda52dd112fb 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserAttributeEntity.java @@ -17,14 +17,14 @@ package org.keycloak.storage.jpa.entity; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentClientScopeEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentClientScopeEntity.java index 22bcc8e85011..ec287a572553 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentClientScopeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentClientScopeEntity.java @@ -19,16 +19,16 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentEntity.java index 87d427dcab7f..d2d20182882d 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentEntity.java @@ -17,17 +17,17 @@ package org.keycloak.storage.jpa.entity; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import java.util.ArrayList; import java.util.Collection; diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserCredentialEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserCredentialEntity.java index 63d5a89f4913..50a3cabaa6ec 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserCredentialEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserCredentialEntity.java @@ -19,18 +19,18 @@ import org.keycloak.models.jpa.entities.UserEntity; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Collection; diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserGroupMembershipEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserGroupMembershipEntity.java index 2cf6857c838e..132dcf9384ba 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserGroupMembershipEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserGroupMembershipEntity.java @@ -19,13 +19,13 @@ import org.keycloak.storage.jpa.KeyUtils; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRequiredActionEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRequiredActionEntity.java index d4b48799c180..0f0d65efd9ad 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRequiredActionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRequiredActionEntity.java @@ -19,13 +19,13 @@ import org.keycloak.storage.jpa.KeyUtils; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRoleMappingEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRoleMappingEntity.java index 1a2580f5bf82..3a44751e9e07 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRoleMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRoleMappingEntity.java @@ -19,13 +19,13 @@ import org.keycloak.storage.jpa.KeyUtils; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyExportImportManager.java b/model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyExportImportManager.java index e03b62b55c9f..44f04a3e1755 100644 --- a/model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyExportImportManager.java +++ b/model/legacy-private/src/main/java/org/keycloak/storage/datastore/LegacyExportImportManager.java @@ -100,7 +100,7 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.validation.ValidationUtil; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java index e50ce97780a0..d72c3e82f7d5 100644 --- a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java +++ b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java @@ -23,8 +23,8 @@ import org.keycloak.models.cache.CachePublicKeyProvider; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.POST; -import javax.ws.rs.core.Context; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.core.Context; public class ClearKeysCacheResource { diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java index 262bca8f9760..bd1d2bfd1193 100644 --- a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java +++ b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java @@ -22,7 +22,7 @@ import org.keycloak.models.cache.CacheRealmProvider; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; /** * Clear user cache. diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java index 77c50183b158..ec4925497d44 100644 --- a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java +++ b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java @@ -22,7 +22,7 @@ import org.keycloak.models.cache.UserCache; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; /** * Clear user cache. diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java index ac4387a7812c..9a1207002c93 100644 --- a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java +++ b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java @@ -17,7 +17,7 @@ package org.keycloak.services.resources.admin; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.common.ClientConnection; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; @@ -25,12 +25,12 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; import org.keycloak.storage.client.ClientStorageProvider; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import java.util.HashMap; import java.util.Map; diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java index 12146f4e8daf..19137d493fd1 100644 --- a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java +++ b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java @@ -18,7 +18,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.common.ClientConnection; import org.keycloak.component.ComponentModel; import org.keycloak.events.admin.OperationType; @@ -33,15 +33,15 @@ import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.storage.user.SynchronizationResult; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import java.util.HashMap; import java.util.Map; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaAttributeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaAttributeEntity.java index 35f4f1bff859..2237620deff1 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaAttributeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaAttributeEntity.java @@ -18,13 +18,13 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.Nationalized; /** diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorage.java index 67a5a932520b..784b9ba1600c 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorage.java @@ -24,17 +24,18 @@ import java.util.Objects; import java.util.UUID; import java.util.stream.Stream; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.PersistenceException; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.hibernate.Session; import org.hibernate.internal.SessionImpl; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProvider.java index 1408d9242ed6..d4229998e5a8 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProvider.java @@ -16,7 +16,7 @@ */ package org.keycloak.models.map.storage.jpa; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransaction; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java index 052ca829d0b2..29c569af8b76 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapStorageProviderFactory.java @@ -34,17 +34,17 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; -import javax.transaction.HeuristicMixedException; -import javax.transaction.HeuristicRollbackException; -import javax.transaction.InvalidTransactionException; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.HeuristicMixedException; +import jakarta.transaction.HeuristicRollbackException; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.SessionImpl; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapUtils.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapUtils.java index 44c8730aee8b..58182e3dadbf 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapUtils.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaMapUtils.java @@ -23,8 +23,8 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.jboss.logging.Logger; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaModelCriteriaBuilder.java index 320067079f2b..681113692d4a 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaModelCriteriaBuilder.java @@ -29,9 +29,9 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; import org.keycloak.models.map.common.StringKeyConverter; import org.keycloak.models.map.storage.CriterionNotSupportedException; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaPredicateFunction.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaPredicateFunction.java index f938d8a02dfb..7fd5eb504e93 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaPredicateFunction.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaPredicateFunction.java @@ -17,9 +17,9 @@ package org.keycloak.models.map.storage.jpa; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import java.util.Objects; import java.util.function.Function; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaSubqueryProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaSubqueryProvider.java index 4a17e7e2abcd..50704a758e8f 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaSubqueryProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaSubqueryProvider.java @@ -17,12 +17,12 @@ package org.keycloak.models.map.storage.jpa; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.criteria.Subquery; /** * This is handed down to a {@link JpaModelCriteriaBuilder} to be able to create subqueries. - * Depending on the caller this will delegate of an instance of a {@link javax.persistence.criteria.CriteriaDelete} - * or a {@link javax.persistence.criteria.CriteriaQuery} as necessary. + * Depending on the caller this will delegate of an instance of a {@link jakarta.persistence.criteria.CriteriaDelete} + * or a {@link jakarta.persistence.criteria.CriteriaQuery} as necessary. * * @author Alexander Schwartz */ diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaTransactionWrapper.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaTransactionWrapper.java index f5fddb3383e1..4c537d2e8cd3 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaTransactionWrapper.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaTransactionWrapper.java @@ -16,8 +16,8 @@ */ package org.keycloak.models.map.storage.jpa; -import javax.persistence.EntityTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.PersistenceException; import org.jboss.logging.Logger; import org.keycloak.models.KeycloakTransaction; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/PaginationUtils.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/PaginationUtils.java index c8eddb3c42c3..f164ab2aea6f 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/PaginationUtils.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/PaginationUtils.java @@ -17,7 +17,7 @@ package org.keycloak.models.map.storage.jpa; -import javax.persistence.TypedQuery; +import jakarta.persistence.TypedQuery; public class PaginationUtils { diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/PersistenceExceptionConverter.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/PersistenceExceptionConverter.java index 0965beb62b15..70fb2870291d 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/PersistenceExceptionConverter.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/PersistenceExceptionConverter.java @@ -23,8 +23,8 @@ import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ModelException; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/JpaRootAuthenticationSessionMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/JpaRootAuthenticationSessionMapStorage.java index dea2c625b7a6..b1efb31279f2 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/JpaRootAuthenticationSessionMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/JpaRootAuthenticationSessionMapStorage.java @@ -16,11 +16,11 @@ */ package org.keycloak.models.map.storage.jpa.authSession; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.hibernate.Session; import org.hibernate.query.NativeQuery; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/delegate/JpaRootAuthenticationSessionDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/delegate/JpaRootAuthenticationSessionDelegateProvider.java index 990e2d8fe5b5..9d896d37bfb9 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/delegate/JpaRootAuthenticationSessionDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/delegate/JpaRootAuthenticationSessionDelegateProvider.java @@ -17,7 +17,7 @@ package org.keycloak.models.map.storage.jpa.authSession.delegate; import java.util.UUID; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.models.map.authSession.MapRootAuthenticationSessionEntity; import org.keycloak.models.map.authSession.MapRootAuthenticationSessionEntityFields; import org.keycloak.models.map.common.EntityField; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaAuthenticationSessionEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaAuthenticationSessionEntity.java index f42732d226e2..fb3787df67d4 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaAuthenticationSessionEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaAuthenticationSessionEntity.java @@ -20,16 +20,16 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaRootAuthenticationSessionEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaRootAuthenticationSessionEntity.java index c97570f9c245..2cc33a91e785 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaRootAuthenticationSessionEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authSession/entity/JpaRootAuthenticationSessionEntity.java @@ -22,15 +22,15 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionMapStorage.java index b5509b02d86e..15a06c42d4d0 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.authorization.permission; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.models.KeycloakSession; import org.keycloak.models.map.authorization.entity.MapPermissionTicketEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionModelCriteriaBuilder.java index b23961421314..e762151b8da2 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/JpaPermissionModelCriteriaBuilder.java @@ -19,7 +19,7 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -import javax.persistence.criteria.CriteriaBuilder.In; +import jakarta.persistence.criteria.CriteriaBuilder.In; import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.model.PermissionTicket.SearchableFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/delegate/JpaPermissionDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/delegate/JpaPermissionDelegateProvider.java index 011cccb6bebf..b3c9c3b328a9 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/delegate/JpaPermissionDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/delegate/JpaPermissionDelegateProvider.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.models.map.authorization.entity.MapPermissionTicketEntity; import org.keycloak.models.map.authorization.entity.MapPermissionTicketEntityFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/entity/JpaPermissionEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/entity/JpaPermissionEntity.java index 6593dd71f4c3..188ab96628d1 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/entity/JpaPermissionEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/permission/entity/JpaPermissionEntity.java @@ -18,14 +18,14 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyMapStorage.java index 38dd5a9cb769..d0af516217de 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.authorization.policy; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.authorization.model.Policy; import org.keycloak.models.KeycloakSession; import org.keycloak.models.map.authorization.entity.MapPolicyEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyModelCriteriaBuilder.java index 9062f4fdc0fa..90ba9145eb85 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/JpaPolicyModelCriteriaBuilder.java @@ -20,9 +20,9 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -import javax.persistence.criteria.CriteriaBuilder.In; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.CriteriaBuilder.In; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Policy.SearchableFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/delegate/JpaPolicyDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/delegate/JpaPolicyDelegateProvider.java index 8a887ec7e85c..5c0000c61fb3 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/delegate/JpaPolicyDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/delegate/JpaPolicyDelegateProvider.java @@ -18,11 +18,11 @@ import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.keycloak.models.map.authorization.entity.MapPolicyEntity; import org.keycloak.models.map.authorization.entity.MapPolicyEntityFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/entity/JpaPolicyConfigEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/entity/JpaPolicyConfigEntity.java index 1d7264c72b6c..d703a7452cd2 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/entity/JpaPolicyConfigEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/entity/JpaPolicyConfigEntity.java @@ -17,8 +17,8 @@ package org.keycloak.models.map.storage.jpa.authorization.policy.entity; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.keycloak.models.map.storage.jpa.JpaAttributeEntity; @Entity diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/entity/JpaPolicyEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/entity/JpaPolicyEntity.java index b1b775aefbe5..5201a38915a9 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/entity/JpaPolicyEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/policy/entity/JpaPolicyEntity.java @@ -23,19 +23,19 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceMapStorage.java index f67781579f68..c68b1f46d2fa 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.authorization.resource; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.authorization.model.Resource; import org.keycloak.models.KeycloakSession; import org.keycloak.models.map.authorization.entity.MapResourceEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceModelCriteriaBuilder.java index 3934156045f6..a2ee9814d878 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/JpaResourceModelCriteriaBuilder.java @@ -20,8 +20,8 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -import javax.persistence.criteria.CriteriaBuilder.In; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.CriteriaBuilder.In; +import jakarta.persistence.criteria.JoinType; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.Resource.SearchableFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/delegate/JpaResourceDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/delegate/JpaResourceDelegateProvider.java index 1be2b75b05b1..d91a531d4736 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/delegate/JpaResourceDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/delegate/JpaResourceDelegateProvider.java @@ -18,11 +18,11 @@ import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.keycloak.models.map.authorization.entity.MapResourceEntity; import org.keycloak.models.map.authorization.entity.MapResourceEntityFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/entity/JpaResourceAttributeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/entity/JpaResourceAttributeEntity.java index dcdf5501117f..8d9519ae148a 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/entity/JpaResourceAttributeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/entity/JpaResourceAttributeEntity.java @@ -16,8 +16,8 @@ */ package org.keycloak.models.map.storage.jpa.authorization.resource.entity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.keycloak.models.map.storage.jpa.JpaAttributeEntity; @Entity diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/entity/JpaResourceEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/entity/JpaResourceEntity.java index 01a373a585ec..bdb585138634 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/entity/JpaResourceEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resource/entity/JpaResourceEntity.java @@ -25,19 +25,19 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/JpaResourceServerMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/JpaResourceServerMapStorage.java index 4f3c2ba97e4e..08f0e12a4238 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/JpaResourceServerMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/JpaResourceServerMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.authorization.resourceServer; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.KeycloakSession; import org.keycloak.models.map.authorization.entity.MapResourceServerEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/delegate/JpaResourceServerDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/delegate/JpaResourceServerDelegateProvider.java index b8338821bf45..5a5d911fc796 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/delegate/JpaResourceServerDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/delegate/JpaResourceServerDelegateProvider.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.models.map.authorization.entity.MapResourceServerEntity; import org.keycloak.models.map.authorization.entity.MapResourceServerEntityFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/entity/JpaResourceServerEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/entity/JpaResourceServerEntity.java index 666beeec7bc4..5255c0ca69fd 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/entity/JpaResourceServerEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/resourceServer/entity/JpaResourceServerEntity.java @@ -18,14 +18,14 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeMapStorage.java index 5742f76adf1b..06f4377f94d0 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.authorization.scope; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.authorization.model.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.map.authorization.entity.MapScopeEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeModelCriteriaBuilder.java index 7c0bfbd63c1d..c271e0050df2 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/JpaScopeModelCriteriaBuilder.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.Objects; import java.util.UUID; -import javax.persistence.criteria.CriteriaBuilder.In; +import jakarta.persistence.criteria.CriteriaBuilder.In; import org.keycloak.authorization.model.Scope; import org.keycloak.authorization.model.Scope.SearchableFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/delagate/JpaScopeDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/delagate/JpaScopeDelegateProvider.java index 4edae9488ce4..d7fba94df99d 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/delagate/JpaScopeDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/delagate/JpaScopeDelegateProvider.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.models.map.authorization.entity.MapScopeEntity; import org.keycloak.models.map.authorization.entity.MapScopeEntityFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/entity/JpaScopeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/entity/JpaScopeEntity.java index caa6420b3f9f..be0ec93c46e0 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/entity/JpaScopeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/authorization/scope/entity/JpaScopeEntity.java @@ -18,14 +18,14 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientMapStorage.java index 4c115ecae4f4..3ffe39b516ad 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.client; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.map.client.MapClientEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientModelCriteriaBuilder.java index c4b920681788..f3838754614d 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/JpaClientModelCriteriaBuilder.java @@ -16,8 +16,8 @@ */ package org.keycloak.models.map.storage.jpa.client; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientModel.SearchableFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/delegate/JpaClientDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/delegate/JpaClientDelegateProvider.java index e94a77e031df..a5e0dd94d8d3 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/delegate/JpaClientDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/delegate/JpaClientDelegateProvider.java @@ -18,11 +18,11 @@ import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.keycloak.models.map.client.MapClientEntity; import org.keycloak.models.map.client.MapClientEntityFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientAttributeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientAttributeEntity.java index cc4c6d812b6d..3c09a3cebbbd 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientAttributeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientAttributeEntity.java @@ -16,9 +16,9 @@ */ package org.keycloak.models.map.storage.jpa.client.entity; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.keycloak.models.map.storage.jpa.JpaAttributeEntityWithHashValue; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientEntity.java index f0aa228a46f0..e481460b56a1 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/client/entity/JpaClientEntity.java @@ -26,16 +26,16 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/JpaClientScopeMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/JpaClientScopeMapStorage.java index 67788c476f5d..63d1295a5865 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/JpaClientScopeMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/JpaClientScopeMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.clientScope; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.map.clientscope.MapClientScopeEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/delegate/JpaClientScopeDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/delegate/JpaClientScopeDelegateProvider.java index a36ed389d6a1..01fc6df498b1 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/delegate/JpaClientScopeDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/delegate/JpaClientScopeDelegateProvider.java @@ -18,11 +18,11 @@ import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.keycloak.models.map.clientscope.MapClientScopeEntity; import org.keycloak.models.map.clientscope.MapClientScopeEntityFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/entity/JpaClientScopeAttributeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/entity/JpaClientScopeAttributeEntity.java index 78edf51874da..06aff2f9800e 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/entity/JpaClientScopeAttributeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/entity/JpaClientScopeAttributeEntity.java @@ -16,9 +16,9 @@ */ package org.keycloak.models.map.storage.jpa.clientScope.entity; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.keycloak.models.map.storage.jpa.JpaAttributeEntityWithHashValue; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/entity/JpaClientScopeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/entity/JpaClientScopeEntity.java index f02b08167783..c45885dc649c 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/entity/JpaClientScopeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/clientScope/entity/JpaClientScopeEntity.java @@ -26,16 +26,16 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/JpaAdminEventMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/JpaAdminEventMapStorage.java index 14ed4cdc1215..e097f7e5428d 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/JpaAdminEventMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/JpaAdminEventMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.event.admin; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.events.admin.AdminEvent; import org.keycloak.models.KeycloakSession; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/JpaAdminEventModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/JpaAdminEventModelCriteriaBuilder.java index 0d2385a2b388..dfc37184d95c 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/JpaAdminEventModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/JpaAdminEventModelCriteriaBuilder.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaBuilder; import org.keycloak.events.admin.AdminEvent; import org.keycloak.models.map.storage.CriterionNotSupportedException; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/entity/JpaAdminEventEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/entity/JpaAdminEventEntity.java index 6a34d6b35b5d..2d8235b75152 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/entity/JpaAdminEventEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/admin/entity/JpaAdminEventEntity.java @@ -19,13 +19,13 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/JpaAuthEventMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/JpaAuthEventMapStorage.java index 57399a05027b..a38ad712ece0 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/JpaAuthEventMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/JpaAuthEventMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.event.auth; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.events.Event; import org.keycloak.models.KeycloakSession; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/JpaAuthEventModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/JpaAuthEventModelCriteriaBuilder.java index ec3822b04110..31d620229b07 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/JpaAuthEventModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/JpaAuthEventModelCriteriaBuilder.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaBuilder; import org.keycloak.events.Event; import org.keycloak.models.map.storage.CriterionNotSupportedException; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/entity/JpaAuthEventDetailEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/entity/JpaAuthEventDetailEntity.java index 20cf2f10a3a9..093f8062fc11 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/entity/JpaAuthEventDetailEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/entity/JpaAuthEventDetailEntity.java @@ -16,9 +16,9 @@ */ package org.keycloak.models.map.storage.jpa.event.auth.entity; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.keycloak.models.map.storage.jpa.JpaAttributeEntityWithHashValue; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/entity/JpaAuthEventEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/entity/JpaAuthEventEntity.java index 006edc4542dc..94a1cdaa3284 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/entity/JpaAuthEventEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/event/auth/entity/JpaAuthEventEntity.java @@ -23,15 +23,15 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupMapStorage.java index 70d1cc0a8221..92919e6c8686 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.group; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.map.group.MapGroupEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupModelCriteriaBuilder.java index ac5f582fbd2a..da6ce01a30e0 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/JpaGroupModelCriteriaBuilder.java @@ -19,10 +19,10 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -import javax.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; import org.keycloak.models.GroupModel; import org.keycloak.models.map.storage.CriterionNotSupportedException; import org.keycloak.models.map.storage.jpa.group.entity.JpaGroupAttributeEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/delegate/JpaGroupDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/delegate/JpaGroupDelegateProvider.java index b513eff3d65e..946bbe6629ff 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/delegate/JpaGroupDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/delegate/JpaGroupDelegateProvider.java @@ -18,11 +18,11 @@ import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.keycloak.models.map.common.EntityField; import org.keycloak.models.map.common.delegate.DelegateProvider; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/entity/JpaGroupAttributeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/entity/JpaGroupAttributeEntity.java index 85771e0349c6..efa4dfd2aa5d 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/entity/JpaGroupAttributeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/entity/JpaGroupAttributeEntity.java @@ -16,9 +16,9 @@ */ package org.keycloak.models.map.storage.jpa.group.entity; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.keycloak.models.map.storage.jpa.JpaAttributeEntityWithHashValue; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/entity/JpaGroupEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/entity/JpaGroupEntity.java index 22b9633414ee..46554f275eff 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/entity/JpaGroupEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/group/entity/JpaGroupEntity.java @@ -25,16 +25,16 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/JpaMapExceptionConverter.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/JpaMapExceptionConverter.java index 80d62aac3d12..5f697eb50a8c 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/JpaMapExceptionConverter.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/JpaMapExceptionConverter.java @@ -21,7 +21,7 @@ import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ExceptionConverter; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * This is needed for example by org.keycloak.transaction.JtaTransactionWrapper to map an exception diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/listeners/JpaOptimisticLockingListener.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/listeners/JpaOptimisticLockingListener.java index fbfbbc0942cc..5ed0400c73ef 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/listeners/JpaOptimisticLockingListener.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/hibernate/listeners/JpaOptimisticLockingListener.java @@ -28,14 +28,14 @@ import org.keycloak.models.map.storage.jpa.JpaChildEntity; import org.keycloak.models.map.storage.jpa.JpaRootVersionedEntity; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import java.util.Objects; import org.keycloak.models.map.storage.jpa.JpaRootEntity; /** * Listen on changes on child entities and forces an optimistic locking increment on the closest parent aka root. * The assumption is that any parent of a child entity is root entity. Optimistic locking is enforced on child entity - * which is not the child entity at the same time. This prevents {@link javax.persistence.OptimisticLockException}s + * which is not the child entity at the same time. This prevents {@link jakarta.persistence.OptimisticLockException}s * when different children in the same parent are being manipulated at the same time by different threads. * * This support a multiple level parent-child relationship, where only the closest parent is locked. diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/JpaUserLoginFailureMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/JpaUserLoginFailureMapStorage.java index f0da711ac3de..f56f11d287d7 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/JpaUserLoginFailureMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/JpaUserLoginFailureMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.loginFailure; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserLoginFailureModel; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/delegate/JpaUserLoginFailureDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/delegate/JpaUserLoginFailureDelegateProvider.java index de19a31e44d6..1c765de5dd5e 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/delegate/JpaUserLoginFailureDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/delegate/JpaUserLoginFailureDelegateProvider.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.models.map.common.EntityField; import org.keycloak.models.map.common.delegate.DelegateProvider; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/entity/JpaUserLoginFailureEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/entity/JpaUserLoginFailureEntity.java index 13c144d378ca..88d0b3c31216 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/entity/JpaUserLoginFailureEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/loginFailure/entity/JpaUserLoginFailureEntity.java @@ -19,14 +19,14 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmMapStorage.java index 6c04cf779f2e..efdc4be3ec3b 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.realm; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmModelCriteriaBuilder.java index 52947842c977..bc99fe42dc79 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/JpaRealmModelCriteriaBuilder.java @@ -16,7 +16,7 @@ */ package org.keycloak.models.map.storage.jpa.realm; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.JoinType; import org.keycloak.models.RealmModel; import org.keycloak.models.map.storage.CriterionNotSupportedException; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/delegate/JpaRealmDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/delegate/JpaRealmDelegateProvider.java index 070227ec610b..9ffee3496396 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/delegate/JpaRealmDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/delegate/JpaRealmDelegateProvider.java @@ -18,11 +18,11 @@ import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.keycloak.models.map.common.EntityField; import org.keycloak.models.map.common.delegate.DelegateProvider; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaComponentEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaComponentEntity.java index 1222dc9a0353..60e8b8dd2d95 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaComponentEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaComponentEntity.java @@ -21,15 +21,15 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; @@ -52,7 +52,7 @@ * the component endpoints. *

* By implementing {@link JpaRootVersionedEntity}, this entity will enforce optimistic locking, which can lead to - * {@link javax.persistence.OptimisticLockException} if more than one thread attempts to modify the same component + * {@link jakarta.persistence.OptimisticLockException} if more than one thread attempts to modify the same component * at the same time. * * @author Stefan Guilhen diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaRealmAttributeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaRealmAttributeEntity.java index 9fb3d65bf845..a1b9fed7e035 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaRealmAttributeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaRealmAttributeEntity.java @@ -16,9 +16,9 @@ */ package org.keycloak.models.map.storage.jpa.realm.entity; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.keycloak.models.map.storage.jpa.JpaAttributeEntityWithHashValue; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaRealmEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaRealmEntity.java index 2490adebe02b..7488dd582b76 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaRealmEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/realm/entity/JpaRealmEntity.java @@ -27,16 +27,16 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleMapStorage.java index 209dfcc60dd9..ae05454f31aa 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.role; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleModelCriteriaBuilder.java index a2e9a06c78fd..ed973a63af44 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/JpaRoleModelCriteriaBuilder.java @@ -19,9 +19,9 @@ import java.util.Arrays; import java.util.Set; import java.util.UUID; -import javax.persistence.criteria.CriteriaBuilder.In; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.criteria.CriteriaBuilder.In; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import org.keycloak.models.RoleModel; import org.keycloak.models.RoleModel.SearchableFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaMapRoleEntityDelegate.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaMapRoleEntityDelegate.java index 42b78568a181..0b1acd01ee7b 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaMapRoleEntityDelegate.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaMapRoleEntityDelegate.java @@ -24,9 +24,9 @@ import org.keycloak.models.map.storage.jpa.role.entity.JpaRoleCompositeEntityKey; import org.keycloak.models.map.storage.jpa.role.entity.JpaRoleEntity; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import java.util.Set; import java.util.stream.Collectors; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaRoleDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaRoleDelegateProvider.java index 52edaff4d21c..a5fd95ef28fb 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaRoleDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/delegate/JpaRoleDelegateProvider.java @@ -17,11 +17,11 @@ package org.keycloak.models.map.storage.jpa.role.delegate; import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.keycloak.models.map.common.EntityField; import org.keycloak.models.map.common.delegate.DelegateProvider; import org.keycloak.models.map.role.MapRoleEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleAttributeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleAttributeEntity.java index e0aa5de011a6..b08249c0cdda 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleAttributeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleAttributeEntity.java @@ -16,9 +16,9 @@ */ package org.keycloak.models.map.storage.jpa.role.entity; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.keycloak.models.map.storage.jpa.JpaAttributeEntityWithHashValue; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleCompositeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleCompositeEntity.java index 26e5547817eb..9b3bb33101c7 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleCompositeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleCompositeEntity.java @@ -18,16 +18,16 @@ import org.hibernate.annotations.Immutable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * This is a child table of {@link JpaRoleEntity} that is managed via named queries to avoid loading all its contents - * via a {@link javax.persistence.OneToMany} relation. + * via a {@link jakarta.persistence.OneToMany} relation. */ @Entity @Table(name = "kc_role_composite", uniqueConstraints = {@UniqueConstraint(columnNames = {"role_id", "child_role_id"})}) diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleCompositeEntityKey.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleCompositeEntityKey.java index 182fa4c1bbf6..8a04e0f9c3c3 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleCompositeEntityKey.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleCompositeEntityKey.java @@ -19,8 +19,8 @@ import org.keycloak.models.map.common.StringKeyConverter; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.io.Serializable; import java.util.Objects; import java.util.UUID; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleEntity.java index 6f5f1d80799a..b681be8239b6 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/role/entity/JpaRoleEntity.java @@ -25,16 +25,16 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/JpaSingleUseObjectMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/JpaSingleUseObjectMapStorage.java index 449a179d6fca..1bc44df53a10 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/JpaSingleUseObjectMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/JpaSingleUseObjectMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.singleUseObject; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.models.SingleUseObjectValueModel; import org.keycloak.models.KeycloakSession; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/entity/JpaSingleUseObjectEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/entity/JpaSingleUseObjectEntity.java index 3047f871e7bb..2689d3a009dd 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/entity/JpaSingleUseObjectEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/entity/JpaSingleUseObjectEntity.java @@ -23,15 +23,15 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/entity/JpaSingleUseObjectNoteEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/entity/JpaSingleUseObjectNoteEntity.java index 54dfc35764cd..e3ec9750eed0 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/entity/JpaSingleUseObjectNoteEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/singleUseObject/entity/JpaSingleUseObjectNoteEntity.java @@ -18,9 +18,9 @@ import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.keycloak.models.map.storage.jpa.JpaAttributeEntity; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/JpaUserMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/JpaUserMapStorage.java index 96410da06155..4b944128d1ee 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/JpaUserMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/JpaUserMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.user; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/JpaUserModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/JpaUserModelCriteriaBuilder.java index 77aeb4837aa5..7bfc71ebb271 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/JpaUserModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/JpaUserModelCriteriaBuilder.java @@ -19,9 +19,9 @@ import java.util.Arrays; import java.util.Collection; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; import org.keycloak.models.UserModel; import org.keycloak.models.map.storage.CriterionNotSupportedException; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/delegate/JpaUserDelegateProvider.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/delegate/JpaUserDelegateProvider.java index 97177bfece28..0f423e033389 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/delegate/JpaUserDelegateProvider.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/delegate/JpaUserDelegateProvider.java @@ -18,11 +18,11 @@ import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.keycloak.models.map.common.EntityField; import org.keycloak.models.map.common.delegate.DelegateProvider; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserAttributeEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserAttributeEntity.java index 9904c7bdc0a6..94ec72ea74e8 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserAttributeEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserAttributeEntity.java @@ -16,9 +16,9 @@ */ package org.keycloak.models.map.storage.jpa.user.entity; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.keycloak.models.map.storage.jpa.JpaAttributeEntityWithHashValue; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserConsentEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserConsentEntity.java index 8e31c707fbde..2e885b31cd6b 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserConsentEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserConsentEntity.java @@ -20,16 +20,16 @@ import java.util.Set; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserEntity.java index b270c4c9f53a..a3abfe5aa3ec 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserEntity.java @@ -26,19 +26,19 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserFederatedIdentityEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserFederatedIdentityEntity.java index d9e3c44ea5b8..51c6fda34fa6 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserFederatedIdentityEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/user/entity/JpaUserFederatedIdentityEntity.java @@ -19,15 +19,15 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/JpaUserSessionMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/JpaUserSessionMapStorage.java index 64df96db972f..836d787369d2 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/JpaUserSessionMapStorage.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/JpaUserSessionMapStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.map.storage.jpa.userSession; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserSessionModel; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/JpaUserSessionModelCriteriaBuilder.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/JpaUserSessionModelCriteriaBuilder.java index 72bc16c18037..10cf515cf14c 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/JpaUserSessionModelCriteriaBuilder.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/JpaUserSessionModelCriteriaBuilder.java @@ -18,8 +18,8 @@ import java.util.Objects; import java.util.UUID; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; import org.keycloak.models.UserSessionModel; import org.keycloak.models.UserSessionModel.SearchableFields; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaClientSessionEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaClientSessionEntity.java index d2f6070201f9..8c9cdb5facb6 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaClientSessionEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaClientSessionEntity.java @@ -22,17 +22,17 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaClientSessionNoteEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaClientSessionNoteEntity.java index 793398bfd026..2e69179c46b1 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaClientSessionNoteEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaClientSessionNoteEntity.java @@ -17,8 +17,8 @@ package org.keycloak.models.map.storage.jpa.userSession.entity; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.keycloak.models.map.storage.jpa.JpaAttributeEntity; @Entity diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaUserSessionEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaUserSessionEntity.java index 7d09eb47f84e..1902651b5fe9 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaUserSessionEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaUserSessionEntity.java @@ -24,15 +24,15 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaUserSessionNoteEntity.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaUserSessionNoteEntity.java index b7e362c4e776..a76eb4bb3286 100644 --- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaUserSessionNoteEntity.java +++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/userSession/entity/JpaUserSessionNoteEntity.java @@ -17,8 +17,8 @@ package org.keycloak.models.map.storage.jpa.userSession.entity; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import org.keycloak.models.map.storage.jpa.JpaAttributeEntity; @Entity diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/CacheBuildSteps.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/CacheBuildSteps.java index 096c0b85dede..d80667fa7e16 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/CacheBuildSteps.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/CacheBuildSteps.java @@ -25,7 +25,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.infinispan.commons.util.FileLookupFactory; import org.keycloak.config.MetricsOptions; import org.keycloak.quarkus.runtime.KeycloakRecorder; diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java index 9b6f5d82fda5..46e3e7e4f65c 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java @@ -110,8 +110,8 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.vault.FilesPlainTextVaultProviderFactory; -import javax.persistence.Entity; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.Entity; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; diff --git a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakNegativeHealthCheckTest.java b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakNegativeHealthCheckTest.java index f521a9ce4685..4394b94aab24 100644 --- a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakNegativeHealthCheckTest.java +++ b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakNegativeHealthCheckTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.inject.Inject; +import jakarta.inject.Inject; import static io.restassured.RestAssured.given; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java index cf74b35653e4..6b2092093b9f 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java @@ -31,7 +31,7 @@ import java.util.Arrays; import java.util.List; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.runtime.ApplicationLifecycleManager; import io.quarkus.runtime.Quarkus; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/hostname/DefaultHostnameProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/hostname/DefaultHostnameProvider.java index f28a4c68a8b2..430f83df6b5a 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/hostname/DefaultHostnameProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/hostname/DefaultHostnameProvider.java @@ -29,7 +29,7 @@ import java.net.URL; import java.util.function.BiFunction; import java.util.function.Function; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.common.enums.SslRequired; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusHttpRequest.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusHttpRequest.java index 25deb89a8856..8adebf7c218d 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusHttpRequest.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusHttpRequest.java @@ -18,8 +18,8 @@ package org.keycloak.quarkus.runtime.integration; import java.security.cert.X509Certificate; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import javax.net.ssl.SSLPeerUnverifiedException; import javax.net.ssl.SSLSession; import org.jboss.resteasy.spi.HttpRequest; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusLifecycleObserver.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusLifecycleObserver.java index 8ca3c6ea5daf..a7580c4e9ce9 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusLifecycleObserver.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusLifecycleObserver.java @@ -19,8 +19,8 @@ import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; import org.keycloak.platform.Platform; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/ClientConnectionContextInjector.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/ClientConnectionContextInjector.java index 1d6a23bac041..f9cac319f559 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/ClientConnectionContextInjector.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/ClientConnectionContextInjector.java @@ -17,7 +17,7 @@ package org.keycloak.quarkus.runtime.integration.jaxrs; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Provider; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/KeycloakContextInjector.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/KeycloakContextInjector.java index a39383449797..da0cb0fddbd6 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/KeycloakContextInjector.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/KeycloakContextInjector.java @@ -17,7 +17,7 @@ package org.keycloak.quarkus.runtime.integration.jaxrs; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Provider; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusKeycloakApplication.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusKeycloakApplication.java index e15346a3a2e7..dfdc582d6018 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusKeycloakApplication.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusKeycloakApplication.java @@ -20,7 +20,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.ApplicationPath; +import jakarta.ws.rs.ApplicationPath; import org.keycloak.config.HostnameOptions; import org.keycloak.models.KeycloakSessionFactory; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/TransactionalResponseFilter.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/TransactionalResponseFilter.java index fda6a8c6dd84..7650bcb7e11b 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/TransactionalResponseFilter.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/TransactionalResponseFilter.java @@ -19,17 +19,18 @@ import java.io.IOException; import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.StreamingOutput; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.ext.Provider; import org.keycloak.common.util.Resteasy; import org.keycloak.models.KeycloakSession; import org.keycloak.quarkus.runtime.transaction.TransactionalSessionHandler; +import jakarta.annotation.Priority; + @Provider @PreMatching @Priority(1) diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/TransactionalResponseInterceptor.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/TransactionalResponseInterceptor.java index 1e5918c00297..bd18159f9876 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/TransactionalResponseInterceptor.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/TransactionalResponseInterceptor.java @@ -18,17 +18,18 @@ package org.keycloak.quarkus.runtime.integration.jaxrs; import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.ConstrainedTo; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.ext.Provider; -import javax.ws.rs.ext.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; +import jakarta.ws.rs.ConstrainedTo; +import jakarta.ws.rs.RuntimeType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.ext.WriterInterceptorContext; import org.keycloak.common.util.Resteasy; import org.keycloak.models.KeycloakSession; import org.keycloak.quarkus.runtime.transaction.TransactionalSessionHandler; +import jakarta.annotation.Priority; + @Provider @ConstrainedTo(RuntimeType.SERVER) @Priority(10000) diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/web/QuarkusRequestFilter.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/web/QuarkusRequestFilter.java index 8df87c24dba9..b3eead824fce 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/web/QuarkusRequestFilter.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/web/QuarkusRequestFilter.java @@ -31,7 +31,7 @@ /** *

This filter is responsible for managing the request lifecycle as well as setting up the necessary context to process incoming * requests. We need this filter running on the top of the chain in order to push contextual objects before executing Resteasy. It is not - * possible to use a {@link javax.ws.rs.container.ContainerRequestFilter} for this purpose because some mechanisms like error handling + * possible to use a {@link jakarta.ws.rs.container.ContainerRequestFilter} for this purpose because some mechanisms like error handling * will not be able to access these contextual objects. * *

The filter itself runs in an event loop and should delegate to worker threads any blocking code (for now, all requests are handled diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakReadyHealthCheck.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakReadyHealthCheck.java index 2f04554cf8d8..d2883eaccff0 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakReadyHealthCheck.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakReadyHealthCheck.java @@ -22,8 +22,8 @@ import org.eclipse.microprofile.health.HealthCheckResponseBuilder; import org.eclipse.microprofile.health.Readiness; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.time.Instant; import java.time.ZoneId; import java.time.format.DateTimeFormatter; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/QuarkusWelcomeResource.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/QuarkusWelcomeResource.java index 1f4542151008..b6f13b0aa964 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/QuarkusWelcomeResource.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/QuarkusWelcomeResource.java @@ -38,20 +38,20 @@ import io.quarkus.logging.Log; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response.Status; import java.io.IOException; import java.io.InputStream; import java.net.InetAddress; @@ -163,7 +163,7 @@ public Response getResource(@PathParam("path") String path) { private Response createWelcomePage(String successMessage, String errorMessage) { try { Theme theme = getTheme(); - + if(Objects.isNull(theme)) { Log.error("Theme is null please check the \"--spi-theme-default\" parameter"); errorMessage = "The theme is null"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java index a3d205d45667..9030ba504160 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java @@ -21,11 +21,11 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.Optional; -import javax.enterprise.inject.Instance; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.FlushModeType; -import javax.persistence.SynchronizationType; +import jakarta.enterprise.inject.Instance; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.SynchronizationType; import org.hibernate.internal.SessionFactoryImpl; import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProviderFactory; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/NamedJpaConnectionProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/NamedJpaConnectionProviderFactory.java index ff8387e5d73a..f5cf3bf78c5f 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/NamedJpaConnectionProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/NamedJpaConnectionProviderFactory.java @@ -18,7 +18,7 @@ package org.keycloak.quarkus.runtime.storage.database.jpa; import java.util.function.Supplier; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.keycloak.connections.jpa.DefaultJpaConnectionProvider; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaMapStorageProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaMapStorageProviderFactory.java index 5ae7deb7dc8d..b91d2b29e81e 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaMapStorageProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaMapStorageProviderFactory.java @@ -21,9 +21,9 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.Optional; -import javax.enterprise.inject.Instance; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.enterprise.inject.Instance; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.internal.SessionImpl; import org.keycloak.config.StorageOptions; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/LegacyJpaConnectionProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/LegacyJpaConnectionProviderFactory.java index 396cd76d09c7..bbcbf22b1487 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/LegacyJpaConnectionProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/legacy/database/LegacyJpaConnectionProviderFactory.java @@ -31,9 +31,9 @@ import java.util.List; import java.util.Map; -import javax.enterprise.inject.Instance; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; +import jakarta.enterprise.inject.Instance; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; import io.quarkus.arc.Arc; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/transaction/QuarkusJtaTransactionManagerLookup.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/transaction/QuarkusJtaTransactionManagerLookup.java index 96daac6834b6..b6d36f34f296 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/transaction/QuarkusJtaTransactionManagerLookup.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/transaction/QuarkusJtaTransactionManagerLookup.java @@ -17,8 +17,8 @@ package org.keycloak.quarkus.runtime.transaction; -import javax.enterprise.inject.spi.CDI; -import javax.transaction.TransactionManager; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.transaction.TransactionManager; import org.jboss.logging.Logger; import org.keycloak.Config; diff --git a/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/entity/Realm.java b/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/entity/Realm.java index 36745c4037b4..64348b74cbcc 100644 --- a/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/entity/Realm.java +++ b/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/entity/Realm.java @@ -17,8 +17,8 @@ package com.acme.provider.legacy.jpa.entity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Realm { diff --git a/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/user/MyUserProvider.java b/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/user/MyUserProvider.java index 271bb74e608f..a7961d77ad0e 100644 --- a/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/user/MyUserProvider.java +++ b/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/user/MyUserProvider.java @@ -17,7 +17,7 @@ package com.acme.provider.legacy.jpa.user; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.models.KeycloakSession; import org.keycloak.models.jpa.JpaUserProvider; diff --git a/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/user/MyUserProviderFactory.java b/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/user/MyUserProviderFactory.java index 26866cd7f63a..20a178314bae 100644 --- a/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/user/MyUserProviderFactory.java +++ b/quarkus/tests/integration/src/test-providers/java/com/acme/provider/legacy/jpa/user/MyUserProviderFactory.java @@ -17,7 +17,7 @@ package com.acme.provider.legacy.jpa.user; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserProvider; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitType.java index 69e7c97b861a..ca5bf60bde07 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitUsagesType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitUsagesType.java index ce1e89ddc44b..c1473b73e1c0 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitUsagesType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitUsagesType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; import java.math.BigInteger; /** diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationPinType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationPinType.java index 1559106a9487..ad964bb2ed67 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationPinType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationPinType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AlphabetType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AlphabetType.java index a5bbd2b91f9c..3215bb361056 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AlphabetType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AlphabetType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorBaseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorBaseType.java index 7c0b5bbb034a..ba20b0dd7ba0 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorBaseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorBaseType.java @@ -24,12 +24,12 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorTransportProtocolType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorTransportProtocolType.java index b95583b3c99d..0c23e2b75f6b 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorTransportProtocolType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorTransportProtocolType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnContextDeclarationBaseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnContextDeclarationBaseType.java index ca270eacf483..36cbf443f46c 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnContextDeclarationBaseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnContextDeclarationBaseType.java @@ -24,15 +24,15 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlID; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnMethodBaseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnMethodBaseType.java index da75f024ac59..bf2f063c717e 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnMethodBaseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnMethodBaseType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/BooleanType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/BooleanType.java index 9e4464b2b10f..816ddf073093 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/BooleanType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/BooleanType.java @@ -24,9 +24,9 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ComplexAuthenticatorType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ComplexAuthenticatorType.java index f0a8ee46b18c..3d222e80796a 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ComplexAuthenticatorType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ComplexAuthenticatorType.java @@ -24,12 +24,12 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/DeviceTypeType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/DeviceTypeType.java index d0bab4c6ed47..14ad12bf92a4 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/DeviceTypeType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/DeviceTypeType.java @@ -24,9 +24,9 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionOnlyType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionOnlyType.java index a641e9d4c78d..73813fd5bcc3 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionOnlyType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionOnlyType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionType.java index 4a3fe7d32692..a063adf77265 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/Generation.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/Generation.java index 5880769d19ba..f27c72299130 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/Generation.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/Generation.java @@ -24,13 +24,13 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementRefType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementRefType.java index a04eae19da6e..a167845c238d 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementRefType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementRefType.java @@ -24,11 +24,11 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementsType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementsType.java index b631e4e31038..df6f9b6d7319 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementsType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementsType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/IdentificationType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/IdentificationType.java index 37cb829fd334..9de3c388da48 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/IdentificationType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/IdentificationType.java @@ -24,11 +24,11 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyActivationType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyActivationType.java index 6ae49fb6a8ad..6ca16b41b9de 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyActivationType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyActivationType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeySharingType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeySharingType.java index 5edb33b17c99..cc5f9d0ab7be 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeySharingType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeySharingType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyStorageType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyStorageType.java index 1b333c449aa5..4f9a32a71a05 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyStorageType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyStorageType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/LengthType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/LengthType.java index d67968a7981e..305ec4148561 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/LengthType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/LengthType.java @@ -24,11 +24,11 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; import java.math.BigInteger; /** diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/MediumType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/MediumType.java index b5259a53258b..ec83bfc8c76e 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/MediumType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/MediumType.java @@ -24,9 +24,9 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/NymType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/NymType.java index 8cf0df54fc51..4e4641e320f2 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/NymType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/NymType.java @@ -24,9 +24,9 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/OperationalProtectionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/OperationalProtectionType.java index 903d0b07573f..71a30a4675b9 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/OperationalProtectionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/OperationalProtectionType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PasswordType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PasswordType.java index f2158bd3b312..3353d991741b 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PasswordType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PasswordType.java @@ -24,13 +24,13 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PhysicalVerification.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PhysicalVerification.java index 8c8f0c2fcbbc..ab4ecdfc2d53 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PhysicalVerification.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PhysicalVerification.java @@ -24,13 +24,13 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrincipalAuthenticationMechanismType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrincipalAuthenticationMechanismType.java index c6c512b7b4ba..b70d9442e6dd 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrincipalAuthenticationMechanismType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrincipalAuthenticationMechanismType.java @@ -24,11 +24,11 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrivateKeyProtectionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrivateKeyProtectionType.java index b0451457da92..4eb398de3167 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrivateKeyProtectionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrivateKeyProtectionType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PublicKeyType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PublicKeyType.java index ad41ad1ea098..3c217a7c9b92 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PublicKeyType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PublicKeyType.java @@ -24,12 +24,12 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/RestrictedLengthType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/RestrictedLengthType.java index c74e2f15c184..3c02fe65ea59 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/RestrictedLengthType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/RestrictedLengthType.java @@ -24,9 +24,9 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/RestrictedPasswordType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/RestrictedPasswordType.java index ec860bd83afe..795d4e99eb66 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/RestrictedPasswordType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/RestrictedPasswordType.java @@ -24,9 +24,9 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecretKeyProtectionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecretKeyProtectionType.java index bd60a013aa4e..8c9fd8256c92 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecretKeyProtectionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecretKeyProtectionType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecurityAuditType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecurityAuditType.java index 63f8d2d10644..da0941197cbe 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecurityAuditType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecurityAuditType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SharedSecretChallengeResponseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SharedSecretChallengeResponseType.java index f6ed356592c8..fa1c8244ba24 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SharedSecretChallengeResponseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SharedSecretChallengeResponseType.java @@ -24,12 +24,12 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TechnicalProtectionBaseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TechnicalProtectionBaseType.java index e74986f0b4d4..0df56541cb75 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TechnicalProtectionBaseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TechnicalProtectionBaseType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TimeSyncTokenType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TimeSyncTokenType.java index fc808effcb34..737abc5ca46b 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TimeSyncTokenType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TimeSyncTokenType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; import java.math.BigInteger; /** diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TokenType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TokenType.java index efb8dab69d96..f2e09240d5d1 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TokenType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TokenType.java @@ -24,10 +24,10 @@ package org.keycloak.dom.saml.v2.ac; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/saml-core/src/main/java/org/keycloak/saml/common/DefaultPicketLinkLogger.java b/saml-core/src/main/java/org/keycloak/saml/common/DefaultPicketLinkLogger.java index b6aaabd440ae..e56185a43626 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/DefaultPicketLinkLogger.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/DefaultPicketLinkLogger.java @@ -35,7 +35,8 @@ import javax.security.auth.login.LoginException; import javax.xml.crypto.dsig.XMLSignatureException; import javax.xml.stream.Location; -import javax.xml.ws.WebServiceException; + +import jakarta.xml.ws.WebServiceException; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/saml-core/src/main/java/org/keycloak/saml/common/PicketLinkLogger.java b/saml-core/src/main/java/org/keycloak/saml/common/PicketLinkLogger.java index b8a26421d275..c36b62008323 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/PicketLinkLogger.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/PicketLinkLogger.java @@ -33,7 +33,7 @@ import javax.security.auth.login.LoginException; import javax.xml.crypto.dsig.XMLSignatureException; import javax.xml.stream.Location; -import javax.xml.ws.WebServiceException; +import jakarta.xml.ws.WebServiceException; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java b/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java index e65a2e91a5ae..b0d61d8491cf 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java @@ -29,9 +29,9 @@ import org.w3c.dom.Node; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.util.JAXBSource; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.util.JAXBSource; import javax.xml.namespace.QName; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.Attribute; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SignatureUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SignatureUtil.java index 3266e5356eb4..bac9ad7cd2ad 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SignatureUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SignatureUtil.java @@ -29,7 +29,7 @@ import org.xml.sax.SAXException; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.io.OutputStream; import java.security.GeneralSecurityException; import java.security.PrivateKey; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXBUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXBUtil.java index bf2ecfeb505a..0da98cde5472 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXBUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXBUtil.java @@ -25,10 +25,10 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLSignatureUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLSignatureUtil.java index b9ea4d622c8f..89d6a111fcf2 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLSignatureUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLSignatureUtil.java @@ -41,7 +41,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.crypto.XMLStructure; import javax.xml.crypto.MarshalException; import javax.xml.crypto.dsig.CanonicalizationMethod; diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java index a6aca012724d..ca82d3f3aeff 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java @@ -27,8 +27,8 @@ import org.keycloak.models.utils.FormMessage; import org.keycloak.services.managers.BruteForceProtector; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; /** * @author Bill Burke diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlow.java b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlow.java index fd5eea970c55..2fee6ef14ca2 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlow.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlow.java @@ -17,7 +17,7 @@ package org.keycloak.authentication; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.List; diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java index 8d3f90373d77..3e1ad3b24e51 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java @@ -17,7 +17,7 @@ package org.keycloak.authentication; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/FormAuthenticator.java b/server-spi-private/src/main/java/org/keycloak/authentication/FormAuthenticator.java index 371649333902..b883a2381c14 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/FormAuthenticator.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/FormAuthenticator.java @@ -20,7 +20,7 @@ import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.provider.Provider; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * This class is responsible for rendering a form. The way it works is that each FormAction that is a child of this diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/FormContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/FormContext.java index 7fad2f0c4ee1..fb340ca640dd 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/FormContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/FormContext.java @@ -27,7 +27,7 @@ import org.keycloak.models.UserModel; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; /** * Interface that encapsulates the current state of the current form being executed diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionContext.java index 4d6340a823d1..17f292681f6e 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionContext.java @@ -26,8 +26,8 @@ import org.keycloak.models.UserModel; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; /** diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/ValidationContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/ValidationContext.java index 736acc3c8ff3..335264819078 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/ValidationContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/ValidationContext.java @@ -19,7 +19,7 @@ import org.keycloak.models.utils.FormMessage; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.List; /** diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java index 8feededf6f25..c4857606373a 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java @@ -27,9 +27,9 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/AuthenticationRequest.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/AuthenticationRequest.java index d0745c5856fd..f344bd80b428 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/AuthenticationRequest.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/AuthenticationRequest.java @@ -22,7 +22,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; /** * @author Pedro Igor diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeExternalToken.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeExternalToken.java index 2b3ef3b11703..5a07d167b0b2 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeExternalToken.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeExternalToken.java @@ -20,7 +20,7 @@ import org.keycloak.events.EventBuilder; import org.keycloak.models.UserSessionModel; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; /** * Exchange a token crafted by this provider for a local realm token. diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeTokenToIdentityProviderToken.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeTokenToIdentityProviderToken.java index b74c04fe5099..6ab3256de540 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeTokenToIdentityProviderToken.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeTokenToIdentityProviderToken.java @@ -21,9 +21,9 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; /** * @author Bill Burke diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProvider.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProvider.java index 72fd71f2aab8..10e27e09d89c 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProvider.java @@ -26,8 +26,8 @@ import org.keycloak.provider.Provider; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; /** * @author Pedro Igor @@ -98,7 +98,7 @@ interface AuthenticationCallback { Response performLogin(AuthenticationRequest request); /** - *

Returns a {@link javax.ws.rs.core.Response} containing the token previously stored during the authentication process for a + *

Returns a {@link jakarta.ws.rs.core.Response} containing the token previously stored during the authentication process for a * specific user.

* * @param identity diff --git a/server-spi-private/src/main/java/org/keycloak/device/DeviceActivityManager.java b/server-spi-private/src/main/java/org/keycloak/device/DeviceActivityManager.java index 1a354c321027..294303565759 100644 --- a/server-spi-private/src/main/java/org/keycloak/device/DeviceActivityManager.java +++ b/server-spi-private/src/main/java/org/keycloak/device/DeviceActivityManager.java @@ -17,7 +17,7 @@ package org.keycloak.device; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import java.io.IOException; import org.keycloak.common.util.Base64; diff --git a/server-spi-private/src/main/java/org/keycloak/forms/account/AccountProvider.java b/server-spi-private/src/main/java/org/keycloak/forms/account/AccountProvider.java index 6714454b34d2..4642c7fc5071 100755 --- a/server-spi-private/src/main/java/org/keycloak/forms/account/AccountProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/forms/account/AccountProvider.java @@ -24,10 +24,10 @@ import org.keycloak.models.utils.FormMessage; import org.keycloak.provider.Provider; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.util.List; /** diff --git a/server-spi-private/src/main/java/org/keycloak/forms/login/LoginFormsProvider.java b/server-spi-private/src/main/java/org/keycloak/forms/login/LoginFormsProvider.java index edf79e2d66c4..4dc258152640 100755 --- a/server-spi-private/src/main/java/org/keycloak/forms/login/LoginFormsProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/forms/login/LoginFormsProvider.java @@ -24,8 +24,8 @@ import org.keycloak.rar.AuthorizationDetails; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.List; diff --git a/server-spi-private/src/main/java/org/keycloak/headers/SecurityHeadersProvider.java b/server-spi-private/src/main/java/org/keycloak/headers/SecurityHeadersProvider.java index 4aece6069dfd..ea16ca104178 100644 --- a/server-spi-private/src/main/java/org/keycloak/headers/SecurityHeadersProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/headers/SecurityHeadersProvider.java @@ -18,8 +18,8 @@ import org.keycloak.provider.Provider; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; public interface SecurityHeadersProvider extends Provider { diff --git a/server-spi-private/src/main/java/org/keycloak/models/OAuth2DeviceCodeModel.java b/server-spi-private/src/main/java/org/keycloak/models/OAuth2DeviceCodeModel.java index 7327efd8d006..34dd97371bff 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/OAuth2DeviceCodeModel.java +++ b/server-spi-private/src/main/java/org/keycloak/models/OAuth2DeviceCodeModel.java @@ -18,8 +18,8 @@ import org.keycloak.common.util.Time; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.HashMap; import java.util.Map; diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java b/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java index a8db3cd6ee76..691d49c1b094 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java @@ -51,9 +51,9 @@ import org.keycloak.transaction.JtaTransactionManagerLookup; import javax.crypto.spec.SecretKeySpec; -import javax.transaction.InvalidTransactionException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; import java.security.Key; import java.security.KeyPair; diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/ClientInstallationProvider.java b/server-spi-private/src/main/java/org/keycloak/protocol/ClientInstallationProvider.java index 0c55c4ffcc6b..fd57f9a4d921 100755 --- a/server-spi-private/src/main/java/org/keycloak/protocol/ClientInstallationProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/ClientInstallationProvider.java @@ -23,7 +23,7 @@ import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.net.URI; /** diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java b/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java index 6d5955a039cc..d46adf7b6493 100755 --- a/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java @@ -27,9 +27,9 @@ import org.keycloak.provider.Provider; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; /** * @author Bill Burke diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeContext.java b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeContext.java index 9f97c7f9335f..ea1798edf914 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeContext.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeContext.java @@ -24,8 +24,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.Map; diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeProvider.java b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeProvider.java index 2d0e2596c41b..f5608cedd67e 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeProvider.java @@ -19,7 +19,7 @@ import org.keycloak.provider.Provider; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * Provides token exchange mechanism for supported tokens diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenIntrospectionProvider.java b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenIntrospectionProvider.java index e30f5dab9f88..1cd205e6667a 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenIntrospectionProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenIntrospectionProvider.java @@ -19,7 +19,7 @@ import org.keycloak.provider.Provider; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * Provides introspection for a determined OAuth2 token type. diff --git a/server-spi-private/src/main/java/org/keycloak/transaction/JtaTransactionManagerLookup.java b/server-spi-private/src/main/java/org/keycloak/transaction/JtaTransactionManagerLookup.java index ebcf52ec880e..156da4eef0a8 100644 --- a/server-spi-private/src/main/java/org/keycloak/transaction/JtaTransactionManagerLookup.java +++ b/server-spi-private/src/main/java/org/keycloak/transaction/JtaTransactionManagerLookup.java @@ -20,7 +20,7 @@ import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; /** * JTA TransactionManager lookup diff --git a/server-spi-private/src/main/java/org/keycloak/userprofile/ValidationException.java b/server-spi-private/src/main/java/org/keycloak/userprofile/ValidationException.java index 65c7a917fa6b..876165274b0c 100644 --- a/server-spi-private/src/main/java/org/keycloak/userprofile/ValidationException.java +++ b/server-spi-private/src/main/java/org/keycloak/userprofile/ValidationException.java @@ -19,7 +19,7 @@ package org.keycloak.userprofile; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; diff --git a/server-spi-private/src/main/java/org/keycloak/utils/ReservedCharValidator.java b/server-spi-private/src/main/java/org/keycloak/utils/ReservedCharValidator.java index 47654cfab7a9..738afb643706 100644 --- a/server-spi-private/src/main/java/org/keycloak/utils/ReservedCharValidator.java +++ b/server-spi-private/src/main/java/org/keycloak/utils/ReservedCharValidator.java @@ -16,7 +16,7 @@ */ package org.keycloak.utils; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.jboss.logging.Logger; import java.util.regex.Matcher; diff --git a/server-spi-private/src/main/java/org/keycloak/validate/ValidationError.java b/server-spi-private/src/main/java/org/keycloak/validate/ValidationError.java index 50a258686e83..3fb6bf3208de 100644 --- a/server-spi-private/src/main/java/org/keycloak/validate/ValidationError.java +++ b/server-spi-private/src/main/java/org/keycloak/validate/ValidationError.java @@ -16,7 +16,7 @@ */ package org.keycloak.validate; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; diff --git a/server-spi-private/src/main/java/org/keycloak/validation/ValidationUtil.java b/server-spi-private/src/main/java/org/keycloak/validation/ValidationUtil.java index ee66ecaca89d..b5a15c6b84f8 100644 --- a/server-spi-private/src/main/java/org/keycloak/validation/ValidationUtil.java +++ b/server-spi-private/src/main/java/org/keycloak/validation/ValidationUtil.java @@ -20,7 +20,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.representations.oidc.OIDCClientRepresentation; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; public class ValidationUtil { diff --git a/server-spi/src/main/java/org/keycloak/http/HttpRequest.java b/server-spi/src/main/java/org/keycloak/http/HttpRequest.java index fd2d1279f88a..8e48721c4f5d 100644 --- a/server-spi/src/main/java/org/keycloak/http/HttpRequest.java +++ b/server-spi/src/main/java/org/keycloak/http/HttpRequest.java @@ -18,9 +18,9 @@ package org.keycloak.http; import java.security.cert.X509Certificate; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.keycloak.models.KeycloakContext; /** diff --git a/server-spi/src/main/java/org/keycloak/models/KeycloakContext.java b/server-spi/src/main/java/org/keycloak/models/KeycloakContext.java index 7f3f42dd6d5b..4a114db58959 100755 --- a/server-spi/src/main/java/org/keycloak/models/KeycloakContext.java +++ b/server-spi/src/main/java/org/keycloak/models/KeycloakContext.java @@ -23,7 +23,7 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.urls.UrlType; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import java.net.URI; import java.util.Locale; diff --git a/server-spi/src/main/java/org/keycloak/models/KeycloakUriInfo.java b/server-spi/src/main/java/org/keycloak/models/KeycloakUriInfo.java index 6f6cd6179fd7..186ffd59e74d 100644 --- a/server-spi/src/main/java/org/keycloak/models/KeycloakUriInfo.java +++ b/server-spi/src/main/java/org/keycloak/models/KeycloakUriInfo.java @@ -20,10 +20,10 @@ import org.keycloak.urls.HostnameProvider; import org.keycloak.urls.UrlType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.List; diff --git a/server-spi/src/main/java/org/keycloak/services/clientpolicy/ClientPolicyException.java b/server-spi/src/main/java/org/keycloak/services/clientpolicy/ClientPolicyException.java index 51460254a884..b8f3071898c1 100644 --- a/server-spi/src/main/java/org/keycloak/services/clientpolicy/ClientPolicyException.java +++ b/server-spi/src/main/java/org/keycloak/services/clientpolicy/ClientPolicyException.java @@ -17,8 +17,8 @@ package org.keycloak.services.clientpolicy; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.keycloak.OAuthErrorException; diff --git a/server-spi/src/main/java/org/keycloak/urls/HostnameProvider.java b/server-spi/src/main/java/org/keycloak/urls/HostnameProvider.java index 0eaab1ba6c94..889200a2b2e9 100644 --- a/server-spi/src/main/java/org/keycloak/urls/HostnameProvider.java +++ b/server-spi/src/main/java/org/keycloak/urls/HostnameProvider.java @@ -19,7 +19,7 @@ import org.keycloak.models.KeycloakContext; import org.keycloak.provider.Provider; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; /** * The Hostname provider is used by Keycloak to decide URLs for frontend and backend requests. A provider can either diff --git a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java index d57102c1237e..0653c9edbe95 100755 --- a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java +++ b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java @@ -58,10 +58,10 @@ import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.io.IOException; import java.net.URI; diff --git a/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java index ad9d93e4f6f2..0d17d498d546 100755 --- a/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java @@ -26,7 +26,7 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.services.ServicesLogger; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; diff --git a/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java index b7da22da188e..551aebd4cc21 100755 --- a/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java @@ -28,9 +28,9 @@ import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.utils.StringUtil; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; diff --git a/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java index 7095b98d0b8b..2a0569f35714 100755 --- a/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java @@ -32,9 +32,9 @@ import org.keycloak.services.resources.LoginActionsService; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.Collections; import java.util.HashMap; diff --git a/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java b/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java index ca30034723c8..768741d17321 100755 --- a/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java +++ b/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java @@ -31,9 +31,9 @@ import org.keycloak.services.resources.LoginActionsService; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; /** diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenContext.java b/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenContext.java index 202ed13e5a9d..04fadf18804b 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenContext.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenContext.java @@ -27,9 +27,9 @@ import org.keycloak.services.Urls; import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilderException; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.UriInfo; import org.keycloak.http.HttpRequest; import org.keycloak.sessions.RootAuthenticationSessionModel; diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenHandler.java index 6bb34f795f03..926fa8bac860 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenHandler.java @@ -24,7 +24,7 @@ import org.keycloak.representations.JsonWebToken; import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * Handler of the action token. diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/DefaultActionToken.java b/services/src/main/java/org/keycloak/authentication/actiontoken/DefaultActionToken.java index b894e4cad19f..07f8e4c1d5f9 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/DefaultActionToken.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/DefaultActionToken.java @@ -28,7 +28,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.services.Urls; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; import java.util.HashMap; import java.util.Map; import java.util.UUID; diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionTokenHandler.java index a81879c40eae..8486e7873688 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionTokenHandler.java @@ -34,9 +34,9 @@ import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; import java.util.Objects; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import static org.keycloak.models.utils.DefaultRequiredActions.getDefaultRequiredActionCaseInsensitively; diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionTokenHandler.java index 092e939ac3b4..030cabc4444c 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionTokenHandler.java @@ -35,9 +35,9 @@ import org.keycloak.sessions.AuthenticationSessionModel; import java.util.Collections; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; /** * Action token handler for verification of e-mail address. diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/resetcred/ResetCredentialsActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/resetcred/ResetCredentialsActionTokenHandler.java index 567b5c0ea742..5b1efd676885 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/resetcred/ResetCredentialsActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/resetcred/ResetCredentialsActionTokenHandler.java @@ -28,7 +28,7 @@ import org.keycloak.services.resources.LoginActionsService; import org.keycloak.services.resources.LoginActionsServiceChecks.IsActionRequired; import org.keycloak.sessions.CommonClientSessionModel.Action; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.keycloak.services.resources.LoginActionsService.RESET_CREDENTIALS_PATH; diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionTokenHandler.java index f4fdc3c76a07..7e9357a4451e 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionTokenHandler.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Objects; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.keycloak.TokenVerifier; import org.keycloak.authentication.actiontoken.AbstractActionTokenHandler; import org.keycloak.authentication.actiontoken.ActionTokenContext; diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionTokenHandler.java index 18ac7a8d7cb9..ceb60360910c 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionTokenHandler.java @@ -33,9 +33,9 @@ import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; import java.util.Objects; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; /** * Action token handler for verification of e-mail address. diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticator.java index 425ed55238e3..3f111d87cd3a 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticator.java @@ -27,7 +27,7 @@ import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.Optional; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/AbstractIdpAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/AbstractIdpAuthenticator.java index 12889cc1a1d3..b8207cb5f491 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/AbstractIdpAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/AbstractIdpAuthenticator.java @@ -31,7 +31,7 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticator.java index b7106fb82114..abaff35f11c8 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticator.java @@ -31,8 +31,8 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticator.java index 0ffe4185bdb9..bd8dce9dcd0c 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticator.java @@ -31,7 +31,7 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.services.messages.Messages; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticator.java index a1901e0ea7e6..0db06154a94c 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticator.java @@ -30,7 +30,7 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.services.messages.Messages; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class IdpDetectExistingBrokerUserAuthenticator extends IdpCreateUserIfUniqueAuthenticator { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticator.java index 7c104a07bd89..4534a14b50ad 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticator.java @@ -43,10 +43,10 @@ import java.net.URI; import java.util.Objects; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.*; +import jakarta.ws.rs.core.*; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticator.java index f121fc5c3c9f..a02120ba8aac 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticator.java @@ -39,8 +39,8 @@ import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileProvider; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; import java.util.stream.Stream; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpUsernamePasswordForm.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpUsernamePasswordForm.java index 1d3d00b6de70..aad28ed30ea5 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpUsernamePasswordForm.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpUsernamePasswordForm.java @@ -30,8 +30,8 @@ import java.util.Optional; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; /** * Same like classic username+password form, but for use in IdP linking. diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java index 79788d1685c3..13d218efe9ae 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java @@ -36,8 +36,8 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.messages.Messages; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import static org.keycloak.authentication.authenticators.util.AuthenticatorUtils.getDisabledByBruteForceEventError; import static org.keycloak.services.validation.Validation.FIELD_PASSWORD; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticator.java index ff9b5c89e316..2675968cd066 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticator.java @@ -23,7 +23,7 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticator.java index bd70feaee848..cdf4ac4441b7 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticator.java @@ -31,8 +31,8 @@ import org.keycloak.services.Urls; import org.keycloak.services.managers.ClientSessionCode; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; import java.util.Objects; import java.util.Optional; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java index 09d92d711fa3..f517e7f1147f 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java @@ -39,8 +39,8 @@ import org.keycloak.services.validation.Validation; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.List; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordForm.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordForm.java index c726390960ef..1f62f4ddc480 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordForm.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordForm.java @@ -27,8 +27,8 @@ import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; public class PasswordForm extends UsernamePasswordForm implements CredentialValidator { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticator.java index 148fda624e8b..3f3effa679ae 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticator.java @@ -19,8 +19,8 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.Optional; import static org.keycloak.services.validation.Validation.FIELD_USERNAME; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticator.java index 7cadf33f5e18..f916f1300292 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticator.java @@ -32,9 +32,9 @@ import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameForm.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameForm.java index 2249198aea00..13ab38c0f0bf 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameForm.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameForm.java @@ -25,8 +25,8 @@ import org.keycloak.models.IdentityProviderModel; import org.keycloak.services.messages.Messages; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; public final class UsernameForm extends UsernamePasswordForm { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java index c126371971c2..c32c6f0938c2 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java @@ -28,8 +28,8 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.services.managers.AuthenticationManager; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java index 5d6e84b69f93..1110957438fb 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java @@ -50,8 +50,8 @@ import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/challenge/BasicAuthAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/challenge/BasicAuthAuthenticator.java index 193791fc0eb7..29359e767947 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/challenge/BasicAuthAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/challenge/BasicAuthAuthenticator.java @@ -28,10 +28,10 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.util.BasicAuthHelper; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/challenge/BasicAuthOTPAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/challenge/BasicAuthOTPAuthenticator.java index aa86abc22f57..9eeae0e85b20 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/challenge/BasicAuthOTPAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/challenge/BasicAuthOTPAuthenticator.java @@ -32,7 +32,7 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/challenge/NoCookieFlowRedirectAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/challenge/NoCookieFlowRedirectAuthenticator.java index 27ca8bb8b42f..94075e5e5d92 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/challenge/NoCookieFlowRedirectAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/challenge/NoCookieFlowRedirectAuthenticator.java @@ -16,9 +16,9 @@ */ package org.keycloak.authentication.authenticators.challenge; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.keycloak.http.HttpRequest; import org.keycloak.authentication.AuthenticationFlowContext; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractClientAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractClientAuthenticator.java index 532efc4a6133..17a212d7d683 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractClientAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractClientAuthenticator.java @@ -24,7 +24,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java index 0b7d7b4bac1b..3aa6d5aa7f48 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java @@ -19,8 +19,8 @@ import org.keycloak.representations.idm.OAuth2ErrorRepresentation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientIdAndSecretAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientIdAndSecretAuthenticator.java index cff4cbe0570c..98c0cc60be0e 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientIdAndSecretAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientIdAndSecretAuthenticator.java @@ -28,10 +28,10 @@ import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.util.BasicAuthHelper; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashSet; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java index 30ca08195ccd..4529cef01b25 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java @@ -29,8 +29,8 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientSecretAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientSecretAuthenticator.java index f8ebd98b336a..608f623fbd62 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientSecretAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientSecretAuthenticator.java @@ -36,8 +36,8 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.services.Urls; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/X509ClientAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/X509ClientAuthenticator.java index 4c986bc4f4b9..f05f10f926c6 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/X509ClientAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/X509ClientAuthenticator.java @@ -12,9 +12,9 @@ import org.keycloak.services.x509.X509ClientCertificateLookup; import javax.security.auth.x500.X500Principal; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.security.GeneralSecurityException; import java.security.cert.X509Certificate; import java.util.Arrays; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/AbstractDirectGrantAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/AbstractDirectGrantAuthenticator.java index b171a8301d80..f5b2332c64a5 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/AbstractDirectGrantAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/AbstractDirectGrantAuthenticator.java @@ -25,8 +25,8 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.representations.idm.OAuth2ErrorRepresentation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateOTP.java b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateOTP.java index ede22e01eb91..1c45f6097f7d 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateOTP.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateOTP.java @@ -31,8 +31,8 @@ import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.provider.ProviderConfigProperty; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.LinkedList; import java.util.List; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidatePassword.java b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidatePassword.java index 5595877d4400..0ecb3acc5192 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidatePassword.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidatePassword.java @@ -28,8 +28,8 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.idm.CredentialRepresentation; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.LinkedList; import java.util.List; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java index 8bb36b9eb4d7..35feb3b93ce8 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java @@ -32,8 +32,8 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.services.managers.AuthenticationManager; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.LinkedList; import java.util.List; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialChooseUser.java b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialChooseUser.java index 78604dee45b6..33ab4b0fec31 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialChooseUser.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialChooseUser.java @@ -36,8 +36,8 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialEmail.java b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialEmail.java index c615d7836c6b..0e14e3eeed95 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialEmail.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialEmail.java @@ -39,8 +39,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import java.util.*; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.util.concurrent.TimeUnit; import org.jboss.logging.Logger; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticator.java index 04668d9e182c..88e797b8dc7e 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticator.java @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.events.Errors; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticator.java index a0d0030430f7..587b6fac886b 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticator.java @@ -25,7 +25,7 @@ import java.util.function.Function; import javax.security.auth.x500.X500Principal; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.codec.binary.Hex; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateDirectGrantAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateDirectGrantAuthenticator.java index f4123bac0854..8889516d335d 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateDirectGrantAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateDirectGrantAuthenticator.java @@ -21,8 +21,8 @@ import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationFlowContext; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java index 6bef0456cc23..3be742cffb60 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java @@ -20,7 +20,7 @@ import java.security.cert.X509Certificate; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java index 1ee6f386235d..84dac629a28c 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java @@ -22,10 +22,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import javax.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationPage.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationPage.java index 72b602f69c69..3d3f8b53e3ff 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationPage.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationPage.java @@ -27,7 +27,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationPassword.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationPassword.java index 9f57d5941a98..610afbc53ed1 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationPassword.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationPassword.java @@ -39,7 +39,7 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.ArrayList; import java.util.List; diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationProfile.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationProfile.java index cb046428c3c2..e2c40f7f3c81 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationProfile.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationProfile.java @@ -38,7 +38,7 @@ import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileProvider; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.List; /** diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java index 18d8511c568d..495a38791418 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java @@ -46,7 +46,7 @@ import org.keycloak.util.JsonSerialization; import java.io.InputStream; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java index d5b13fcb1369..84b33afd4226 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java @@ -41,7 +41,7 @@ import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileProvider; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.List; /** diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/RecoveryAuthnCodesAction.java b/services/src/main/java/org/keycloak/authentication/requiredactions/RecoveryAuthnCodesAction.java index da2c024a3e70..cdff711bd91a 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/RecoveryAuthnCodesAction.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/RecoveryAuthnCodesAction.java @@ -18,8 +18,8 @@ import org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel; import org.keycloak.provider.EnvironmentDependentProviderFactory; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; public class RecoveryAuthnCodesAction implements RequiredActionProvider, RequiredActionFactory, EnvironmentDependentProviderFactory { diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java b/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java index 4cd2d418f83c..fa75404f1f6a 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java @@ -24,7 +24,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.UserModel; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.Arrays; /** diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java index 560c49fbeac9..97d5248b277d 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java @@ -20,9 +20,9 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.authentication.InitiatedActionSupport; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java index d5320a5edf6e..80684f07af87 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java @@ -42,8 +42,8 @@ import org.keycloak.services.validation.Validation; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java index d2967bcc1a9f..366fbd99a589 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java @@ -37,8 +37,8 @@ import org.keycloak.userprofile.UserProfileProvider; import org.keycloak.userprofile.EventAuditingAttributeChangeListener; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java index 87ddca13d695..c35f2a21b140 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java @@ -39,8 +39,8 @@ import org.keycloak.services.validation.Validation; import org.keycloak.utils.CredentialHelper; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.stream.Stream; /** diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java b/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java index 29809bbcac56..46256989cbcf 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java @@ -38,7 +38,7 @@ import org.keycloak.sessions.AuthenticationSessionModel; import java.util.Objects; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.*; +import jakarta.ws.rs.core.*; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyUserProfile.java b/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyUserProfile.java index 4f661744b997..58fefcf9b63a 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyUserProfile.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyUserProfile.java @@ -20,9 +20,9 @@ import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.authentication.InitiatedActionSupport; import org.keycloak.authentication.RequiredActionContext; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegister.java b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegister.java index c6a1001ec060..bedef8121f13 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegister.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegister.java @@ -25,9 +25,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import com.webauthn4j.WebAuthnRegistrationManager; import com.webauthn4j.data.AuthenticatorTransport; diff --git a/services/src/main/java/org/keycloak/authorization/AuthorizationService.java b/services/src/main/java/org/keycloak/authorization/AuthorizationService.java index a70307ac1e53..2c8270318aa1 100644 --- a/services/src/main/java/org/keycloak/authorization/AuthorizationService.java +++ b/services/src/main/java/org/keycloak/authorization/AuthorizationService.java @@ -18,7 +18,7 @@ package org.keycloak.authorization; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.keycloak.authorization.protection.ProtectionService; diff --git a/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java b/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java index 88208eba03ff..21d7b86d1e5e 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java @@ -18,8 +18,8 @@ package org.keycloak.authorization.admin; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.ResourceServer; diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java index ce0891302d4b..8a13d6b96a18 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java @@ -30,11 +30,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java index 3243d7a27ba9..d05c2de1e3aa 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java @@ -20,15 +20,15 @@ import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.authorization.AuthorizationProvider; diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java index 054b6e49aca8..54847bf79bcd 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java @@ -24,17 +24,17 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.authorization.AuthorizationProvider; diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java index e0bfdb7dd4dd..fe1f73f49e10 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.keycloak.authorization.AuthorizationProvider; diff --git a/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java b/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java index e2c1a9c2c5b6..2942f74dd1f2 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java @@ -21,15 +21,15 @@ import java.util.HashMap; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.ResourceServer; diff --git a/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java b/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java index dbe296b0fbec..1ee64e1f4ef2 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java @@ -32,17 +32,17 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java b/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java index b1c055a4c675..49734e82468d 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java @@ -36,18 +36,18 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; import org.keycloak.services.resources.admin.AdminEventBuilder; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.util.Collections; import java.util.EnumMap; diff --git a/services/src/main/java/org/keycloak/authorization/authorization/AuthorizationTokenService.java b/services/src/main/java/org/keycloak/authorization/authorization/AuthorizationTokenService.java index 9b065347d680..52931471d0a1 100644 --- a/services/src/main/java/org/keycloak/authorization/authorization/AuthorizationTokenService.java +++ b/services/src/main/java/org/keycloak/authorization/authorization/AuthorizationTokenService.java @@ -32,10 +32,10 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.logging.Logger; import org.keycloak.http.HttpRequest; diff --git a/services/src/main/java/org/keycloak/authorization/common/KeycloakIdentity.java b/services/src/main/java/org/keycloak/authorization/common/KeycloakIdentity.java index 9b30049ebfd8..3216838ced31 100644 --- a/services/src/main/java/org/keycloak/authorization/common/KeycloakIdentity.java +++ b/services/src/main/java/org/keycloak/authorization/common/KeycloakIdentity.java @@ -38,7 +38,7 @@ import org.keycloak.services.util.DefaultClientSessionContext; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/services/src/main/java/org/keycloak/authorization/config/UmaConfiguration.java b/services/src/main/java/org/keycloak/authorization/config/UmaConfiguration.java index f1ab51d8d08e..75a32b654375 100644 --- a/services/src/main/java/org/keycloak/authorization/config/UmaConfiguration.java +++ b/services/src/main/java/org/keycloak/authorization/config/UmaConfiguration.java @@ -17,8 +17,8 @@ */ package org.keycloak.authorization.config; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.authorization.AuthorizationService; diff --git a/services/src/main/java/org/keycloak/authorization/protection/ProtectionService.java b/services/src/main/java/org/keycloak/authorization/protection/ProtectionService.java index 3751c9e6117b..c2e9c5d8e3dd 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/ProtectionService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/ProtectionService.java @@ -33,8 +33,8 @@ import org.keycloak.services.resources.admin.AdminAuth; import org.keycloak.services.resources.admin.AdminEventBuilder; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response.Status; import org.keycloak.authorization.protection.permission.PermissionTicketService; import org.keycloak.authorization.protection.policy.UserManagedPermissionService; diff --git a/services/src/main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java b/services/src/main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java index 169b34a45cc6..1a538b677dd8 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java +++ b/services/src/main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java @@ -22,8 +22,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/services/src/main/java/org/keycloak/authorization/protection/permission/AbstractPermissionService.java b/services/src/main/java/org/keycloak/authorization/protection/permission/AbstractPermissionService.java index 171c2835eab6..b4791939cda7 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/permission/AbstractPermissionService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/permission/AbstractPermissionService.java @@ -29,7 +29,7 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.Urls; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionService.java b/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionService.java index 3adea4b26f30..b52fa3d6957e 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionService.java @@ -22,10 +22,10 @@ import org.keycloak.authorization.model.ResourceServer; import org.keycloak.representations.idm.authorization.PermissionRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionTicketService.java b/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionTicketService.java index bfc1b2b29e5d..90d094e4b092 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionTicketService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionTicketService.java @@ -36,16 +36,16 @@ import org.keycloak.representations.idm.authorization.PermissionTicketRepresentation; import org.keycloak.services.ErrorResponseException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import java.util.EnumMap; import java.util.Map; import java.util.stream.Collectors; diff --git a/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java b/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java index 8720d674e0d0..b47856b09984 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java @@ -20,17 +20,17 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java b/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java index 68691d7cf97c..f46bf3bf23de 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java @@ -19,17 +19,17 @@ import java.util.function.BiFunction; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.authorization.admin.ResourceSetService; diff --git a/services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java b/services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java index b83dae90a85b..26ce8f4dd617 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java @@ -66,15 +66,15 @@ import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.io.IOException; import java.net.URI; import java.util.Arrays; diff --git a/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProvider.java b/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProvider.java index 2c5ac251e614..9271708fa52c 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProvider.java @@ -39,10 +39,10 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.io.IOException; import static org.keycloak.utils.LockObjectsForModification.lockUserSessionsForModification; diff --git a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java index 84d7552abfcc..ffb0fb9b9b44 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java @@ -62,15 +62,15 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.vault.VaultStringSecret; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java b/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java index 91c3b72ea212..008e456e293c 100755 --- a/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java +++ b/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java @@ -73,19 +73,19 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.messages.Messages; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.PathParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import javax.xml.namespace.QName; import java.io.IOException; import java.security.Key; @@ -116,7 +116,7 @@ import java.security.cert.CertificateException; import java.util.Collections; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import javax.xml.crypto.dsig.XMLSignature; import static org.keycloak.utils.LockObjectsForModification.lockUserSessionsForModification; diff --git a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java index 8d4f604cdc1f..35a4a282637f 100755 --- a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java @@ -78,10 +78,10 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import javax.xml.crypto.dsig.CanonicalizationMethod; import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamWriter; diff --git a/services/src/main/java/org/keycloak/common/util/ResponseSessionTask.java b/services/src/main/java/org/keycloak/common/util/ResponseSessionTask.java index 2c697de33d93..9b189e483647 100644 --- a/services/src/main/java/org/keycloak/common/util/ResponseSessionTask.java +++ b/services/src/main/java/org/keycloak/common/util/ResponseSessionTask.java @@ -16,8 +16,8 @@ */ package org.keycloak.common.util; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakContext; diff --git a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java index 6b848971cac7..2bbf006e7da9 100644 --- a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java +++ b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java @@ -26,15 +26,15 @@ import org.keycloak.truststore.JSSETruststoreConfigurator; import org.keycloak.vault.VaultStringSecret; -import javax.mail.Address; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.Address; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMultipart; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import java.io.UnsupportedEncodingException; diff --git a/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java index f76a8726a017..b4e3197b5c4b 100755 --- a/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java +++ b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java @@ -27,9 +27,9 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import java.util.Map; /** diff --git a/services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java b/services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java index bac9ed9aec6b..f119be2ecba8 100755 --- a/services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java +++ b/services/src/main/java/org/keycloak/forms/account/freemarker/FreeMarkerAccountProvider.java @@ -50,12 +50,12 @@ import org.keycloak.utils.MediaType; import org.keycloak.utils.StringUtil; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.io.IOException; import java.net.URI; import java.text.MessageFormat; diff --git a/services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java index ceaaf94449ee..8d0ebbc79e3d 100755 --- a/services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java +++ b/services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java @@ -21,7 +21,7 @@ import org.keycloak.models.Constants; import org.keycloak.models.UserModel; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/forms/account/freemarker/model/AuthorizationBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/AuthorizationBean.java index 94120a4ea9fd..b821bc45a40a 100755 --- a/services/src/main/java/org/keycloak/forms/account/freemarker/model/AuthorizationBean.java +++ b/services/src/main/java/org/keycloak/forms/account/freemarker/model/AuthorizationBean.java @@ -28,7 +28,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.PermissionTicket; diff --git a/services/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java index 096c73110f45..4607c8f3ce3e 100644 --- a/services/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java +++ b/services/src/main/java/org/keycloak/forms/account/freemarker/model/TotpBean.java @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.utils.TotpUtils; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java b/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java index 23c2d40d68f2..013f730b258a 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java @@ -29,11 +29,11 @@ import java.util.Map; import java.util.Objects; import java.util.Properties; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationFlowContext; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/AbstractUserProfileBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/AbstractUserProfileBean.java index da9484401222..2f8b3b29dde0 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/AbstractUserProfileBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/AbstractUserProfileBean.java @@ -6,7 +6,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.KeycloakSession; import org.keycloak.userprofile.AttributeMetadata; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/EmailBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/EmailBean.java index 11de05e8642e..e5156b0157e4 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/EmailBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/EmailBean.java @@ -16,7 +16,7 @@ */ package org.keycloak.forms.login.freemarker.model; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.UserModel; public class EmailBean { diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdpReviewProfileBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdpReviewProfileBean.java index 64dc27719f44..879ffa618d85 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdpReviewProfileBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdpReviewProfileBean.java @@ -18,7 +18,7 @@ import java.util.stream.Stream; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.authentication.requiredactions.util.UpdateProfileContext; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/LoginBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/LoginBean.java index f2b230b17166..086937b7d2b7 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/LoginBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/LoginBean.java @@ -16,7 +16,7 @@ */ package org.keycloak.forms.login.freemarker.model; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java index 68de38af58ca..9a0c97299a4a 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java @@ -19,7 +19,7 @@ import org.jboss.logging.Logger; import org.keycloak.authentication.requiredactions.util.UpdateProfileContext; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java index af8d54d5f8f1..95ad60be9f61 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.stream.Stream; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.KeycloakSession; import org.keycloak.userprofile.UserProfile; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/SAMLPostFormBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/SAMLPostFormBean.java index 481708b5e276..c06a53af1a37 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/SAMLPostFormBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/SAMLPostFormBean.java @@ -16,7 +16,7 @@ */ package org.keycloak.forms.login.freemarker.model; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.saml.common.constants.GeneralConstants; public class SAMLPostFormBean { diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java index 4153ff51a216..6fe2d8bb7191 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java @@ -26,7 +26,7 @@ import org.keycloak.models.utils.HmacOTP; import org.keycloak.utils.TotpUtils; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/VerifyProfileBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/VerifyProfileBean.java index 42733cacfc3b..b4288cfafed2 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/VerifyProfileBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/VerifyProfileBean.java @@ -2,7 +2,7 @@ import java.util.stream.Stream; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java index 5afd7884a4ed..87ff8e5cab7d 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java @@ -16,7 +16,7 @@ */ package org.keycloak.forms.login.freemarker.model; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.HashMap; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/headers/DefaultSecurityHeadersProvider.java b/services/src/main/java/org/keycloak/headers/DefaultSecurityHeadersProvider.java index 519170093566..58af8967d980 100644 --- a/services/src/main/java/org/keycloak/headers/DefaultSecurityHeadersProvider.java +++ b/services/src/main/java/org/keycloak/headers/DefaultSecurityHeadersProvider.java @@ -22,11 +22,11 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.Collections; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/locale/DefaultLocaleSelectorProvider.java b/services/src/main/java/org/keycloak/locale/DefaultLocaleSelectorProvider.java index 4b330c738345..248c0d7c5d09 100644 --- a/services/src/main/java/org/keycloak/locale/DefaultLocaleSelectorProvider.java +++ b/services/src/main/java/org/keycloak/locale/DefaultLocaleSelectorProvider.java @@ -22,8 +22,8 @@ import org.keycloak.models.UserModel; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; import java.util.List; import java.util.Locale; import java.util.stream.Collectors; diff --git a/services/src/main/java/org/keycloak/locale/DefaultLocaleUpdaterProvider.java b/services/src/main/java/org/keycloak/locale/DefaultLocaleUpdaterProvider.java index d61c59918ccd..e30a0e90916d 100644 --- a/services/src/main/java/org/keycloak/locale/DefaultLocaleUpdaterProvider.java +++ b/services/src/main/java/org/keycloak/locale/DefaultLocaleUpdaterProvider.java @@ -24,7 +24,7 @@ import org.keycloak.services.util.CookieHelper; import org.keycloak.storage.ReadOnlyException; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; public class DefaultLocaleUpdaterProvider implements LocaleUpdaterProvider { diff --git a/services/src/main/java/org/keycloak/partialimport/AbstractPartialImport.java b/services/src/main/java/org/keycloak/partialimport/AbstractPartialImport.java index 3c4528091811..c748b4726555 100644 --- a/services/src/main/java/org/keycloak/partialimport/AbstractPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/AbstractPartialImport.java @@ -23,7 +23,7 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.ServicesLogger; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java b/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java index f904bdc43e5b..d3aeb57ca388 100644 --- a/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java @@ -25,7 +25,7 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.ErrorResponse; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/services/src/main/java/org/keycloak/partialimport/ErrorResponseException.java b/services/src/main/java/org/keycloak/partialimport/ErrorResponseException.java index 7a7fb17efd2a..68e9f16e9dbe 100644 --- a/services/src/main/java/org/keycloak/partialimport/ErrorResponseException.java +++ b/services/src/main/java/org/keycloak/partialimport/ErrorResponseException.java @@ -17,7 +17,7 @@ package org.keycloak.partialimport; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** diff --git a/services/src/main/java/org/keycloak/partialimport/RolesPartialImport.java b/services/src/main/java/org/keycloak/partialimport/RolesPartialImport.java index 28f7fee5a384..2356d109ccdf 100644 --- a/services/src/main/java/org/keycloak/partialimport/RolesPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/RolesPartialImport.java @@ -27,7 +27,7 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.ServicesLogger; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/services/src/main/java/org/keycloak/protocol/AuthorizationEndpointBase.java b/services/src/main/java/org/keycloak/protocol/AuthorizationEndpointBase.java index bda5a4eb61a4..9e88d70ef133 100755 --- a/services/src/main/java/org/keycloak/protocol/AuthorizationEndpointBase.java +++ b/services/src/main/java/org/keycloak/protocol/AuthorizationEndpointBase.java @@ -42,8 +42,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; /** * Common base class for Authorization REST endpoints implementation, which have to be implemented by each protocol. diff --git a/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java b/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java index d4f3580f3c50..d52fbcfa823b 100644 --- a/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java +++ b/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java @@ -32,8 +32,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.UriInfo; import java.util.HashMap; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2Protocol.java b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2Protocol.java index 1c01f3d4a753..56d232490226 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2Protocol.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2Protocol.java @@ -22,10 +22,10 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.TokenUtil; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.text.SimpleDateFormat; import java.util.Date; import java.util.concurrent.atomic.AtomicReference; diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticator.java b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticator.java index cfeaab067b7e..c38bc161f324 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticator.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticator.java @@ -13,9 +13,9 @@ import org.keycloak.representations.docker.DockerError; import org.keycloak.representations.docker.DockerErrorResponseToken; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.Locale; import java.util.Optional; diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerEndpoint.java b/services/src/main/java/org/keycloak/protocol/docker/DockerEndpoint.java index 2f7a570c99be..ae2af34be20c 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerEndpoint.java @@ -19,9 +19,9 @@ import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.utils.ProfileHelper; -import javax.ws.rs.GET; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; /** * Implements a docker-client understandable format. diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerV2LoginProtocolService.java b/services/src/main/java/org/keycloak/protocol/docker/DockerV2LoginProtocolService.java index cec20c504467..0a7be66e769a 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerV2LoginProtocolService.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerV2LoginProtocolService.java @@ -7,9 +7,9 @@ import org.keycloak.services.resources.RealmsResource; import org.keycloak.utils.ProfileHelper; -import javax.ws.rs.Path; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; public class DockerV2LoginProtocolService { diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerComposeYamlInstallationProvider.java b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerComposeYamlInstallationProvider.java index 19ec55fd060e..613d436bf721 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerComposeYamlInstallationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerComposeYamlInstallationProvider.java @@ -10,7 +10,7 @@ import org.keycloak.protocol.docker.DockerAuthV2Protocol; import org.keycloak.protocol.docker.installation.compose.DockerComposeZipContent; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java index e84b4d4750b5..abbca23180c3 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java @@ -8,8 +8,8 @@ import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.docker.DockerAuthV2Protocol; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; public class DockerRegistryConfigFileInstallationProvider implements ClientInstallationProvider { diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java index 967879310beb..864861409a94 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java @@ -8,8 +8,8 @@ import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.docker.DockerAuthV2Protocol; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; public class DockerVariableOverrideInstallationProvider implements ClientInstallationProvider { diff --git a/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java index 408f9848624b..066868dfccf2 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java @@ -32,8 +32,8 @@ import org.keycloak.services.Urls; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/protocol/oidc/DefaultTokenExchangeProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/DefaultTokenExchangeProvider.java index 65ace626b880..5d439d269981 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/DefaultTokenExchangeProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/DefaultTokenExchangeProvider.java @@ -81,10 +81,10 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; /** * Default token exchange implementation diff --git a/services/src/main/java/org/keycloak/protocol/oidc/FrontChannelLogoutHandler.java b/services/src/main/java/org/keycloak/protocol/oidc/FrontChannelLogoutHandler.java index 019520eb2b70..bcac389cc67b 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/FrontChannelLogoutHandler.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/FrontChannelLogoutHandler.java @@ -3,8 +3,8 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.headers.SecurityHeadersProvider; import org.keycloak.models.AuthenticatedClientSessionModel; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocol.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocol.java index 5796b09dc6e6..ad3080435104 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocol.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocol.java @@ -67,10 +67,10 @@ import java.util.Optional; import java.util.UUID; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java index 081cabb28bc2..016928f43fce 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java @@ -48,18 +48,18 @@ import java.util.Objects; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; /** * Resource class for the oauth/openid connect token service diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java index e6a54dc3efcd..b0dc2feba703 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java @@ -52,8 +52,8 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.wellknown.WellKnownProvider; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.AbstractMap; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java index 3be4c656a2c9..45893452df3a 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java @@ -95,9 +95,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import static org.keycloak.representations.IDToken.NONCE; import static org.keycloak.utils.LockObjectsForModification.lockUserSessionsForModification; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpoint.java index 3d6b766566d4..4aca05e675db 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpoint.java @@ -52,13 +52,13 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.TokenUtil; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpointChecker.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpointChecker.java index 2a9be2c5bf1b..1e6e12e22583 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpointChecker.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpointChecker.java @@ -21,8 +21,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java index ca51cf4de4f7..93755270f99d 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java @@ -23,8 +23,8 @@ import org.keycloak.services.util.CacheControlUtil; import org.keycloak.services.util.P3PHelper; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Response; import java.io.InputStream; public class IframeUtil { diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java index f5eb317323ef..1f4c31d17e18 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java @@ -24,12 +24,12 @@ import org.keycloak.protocol.oidc.utils.WebOriginsUtils; import org.keycloak.utils.MediaType; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.util.Set; import static org.keycloak.protocol.oidc.endpoints.IframeUtil.returnIframeFromResources; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java index 42582f35debc..745e79c23a45 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java @@ -82,16 +82,16 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.HashSet; import java.util.Set; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java index 5e84d9b8c014..54a2dd96dcc4 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java @@ -20,11 +20,11 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.utils.MediaType; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import static org.keycloak.protocol.oidc.endpoints.IframeUtil.returnIframeFromResources; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java index 6c479b0de792..09d3323adf51 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java @@ -102,17 +102,17 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.ws.rs.Consumes; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import javax.xml.namespace.QName; import java.io.IOException; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java index 582dcc630f5b..802642725f3d 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java @@ -32,12 +32,12 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.TokenIntrospectContext; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; /** * A token introspection endpoint based on RFC-7662. diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenRevocationEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenRevocationEndpoint.java index e64de0e6a4e0..559cbcd03610 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenRevocationEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenRevocationEndpoint.java @@ -21,13 +21,13 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.keycloak.http.HttpRequest; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java index ae96d8c8dfdf..0a07a43ff0a5 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java @@ -70,14 +70,14 @@ import org.keycloak.utils.MediaType; import org.keycloak.utils.OAuth2Error; -import javax.ws.rs.GET; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequestParserProcessor.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequestParserProcessor.java index 50435fe65886..929d64027fdc 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequestParserProcessor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequestParserProcessor.java @@ -37,8 +37,8 @@ import org.keycloak.services.util.AuthorizationContextUtil; import org.keycloak.util.TokenUtil; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.io.InputStream; import java.util.HashSet; import java.util.List; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java index fa926f37de38..3cb65424fada 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.endpoints.request; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.Set; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/CibaGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/CibaGrantType.java index d1da7a0dc0de..07d139e2c5aa 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/CibaGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/CibaGrantType.java @@ -18,9 +18,9 @@ package org.keycloak.protocol.oidc.grants.ciba; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/HttpAuthenticationChannelProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/HttpAuthenticationChannelProvider.java index c3b2d5adf48a..be641c2e8244 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/HttpAuthenticationChannelProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/HttpAuthenticationChannelProvider.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response.Status; import org.keycloak.broker.provider.util.SimpleHttp; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelAuthenticationRequestContext.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelAuthenticationRequestContext.java index ddf91ad9b0f0..b414f225d4b2 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelAuthenticationRequestContext.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelAuthenticationRequestContext.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.grants.ciba.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.protocol.oidc.grants.ciba.channel.CIBAAuthenticationRequest; import org.keycloak.protocol.oidc.grants.ciba.endpoints.request.BackchannelAuthenticationEndpointRequest; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelTokenRequestContext.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelTokenRequestContext.java index 3636512dcab1..90094099896e 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelTokenRequestContext.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelTokenRequestContext.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.grants.ciba.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.protocol.oidc.grants.ciba.channel.CIBAAuthenticationRequest; import org.keycloak.services.clientpolicy.ClientPolicyContext; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelTokenResponseContext.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelTokenResponseContext.java index 1425d6a3d7b1..d33a22c3108a 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelTokenResponseContext.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/context/BackchannelTokenResponseContext.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.grants.ciba.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.ClientSessionContext; import org.keycloak.protocol.oidc.TokenManager; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSessionEnforceExecutor.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSessionEnforceExecutor.java index 77b0a5b646d1..821602529a1e 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSessionEnforceExecutor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSessionEnforceExecutor.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.grants.ciba.clientpolicy.executor; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSignedAuthenticationRequestExecutor.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSignedAuthenticationRequestExecutor.java index 6f8403372211..e40611dbb825 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSignedAuthenticationRequestExecutor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSignedAuthenticationRequestExecutor.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Optional; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/AbstractCibaEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/AbstractCibaEndpoint.java index 439f40f1dc87..1309da66162a 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/AbstractCibaEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/AbstractCibaEndpoint.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.grants.ciba.endpoints; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.keycloak.OAuthErrorException; import org.keycloak.common.ClientConnection; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java index 504e73bc97d6..a2bb0b41de7f 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java @@ -38,13 +38,13 @@ import org.keycloak.services.Urls; import org.keycloak.services.managers.AppAuthManager; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java index 556cb7d89b4b..5b600ac16209 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java @@ -45,13 +45,13 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.Optional; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/CibaRootEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/CibaRootEndpoint.java index 5842d6cc09cc..ef996fb594fd 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/CibaRootEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/CibaRootEndpoint.java @@ -17,7 +17,7 @@ */ package org.keycloak.protocol.oidc.grants.ciba.endpoints; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.keycloak.common.Profile; import org.keycloak.events.EventBuilder; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java index 6c95c4d66c14..767e2c278729 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java @@ -17,7 +17,7 @@ */ package org.keycloak.protocol.oidc.grants.ciba.endpoints.request; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.Set; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParserProcessor.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParserProcessor.java index 3636471d6d24..618db3569684 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParserProcessor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParserProcessor.java @@ -30,8 +30,8 @@ import org.keycloak.protocol.oidc.utils.RedirectUtils; import org.keycloak.services.ErrorResponseException; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.io.InputStream; import java.util.HashSet; import java.util.List; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java index 12e9cc5e8090..cdc224986be2 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java @@ -56,10 +56,10 @@ import org.keycloak.services.util.DefaultClientSessionContext; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceAuthorizationRequestContext.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceAuthorizationRequestContext.java index 42a966f2c496..7ab75ac16987 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceAuthorizationRequestContext.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceAuthorizationRequestContext.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.grants.device.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequest; import org.keycloak.services.clientpolicy.ClientPolicyContext; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenRequestContext.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenRequestContext.java index fe2d0d0d9a19..57be2c67b18b 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenRequestContext.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenRequestContext.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.grants.device.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.OAuth2DeviceCodeModel; import org.keycloak.services.clientpolicy.ClientPolicyContext; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenResponseContext.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenResponseContext.java index 6c279ff45aed..f2322e440a52 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenResponseContext.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/clientpolicy/context/DeviceTokenResponseContext.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.grants.device.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.OAuth2DeviceCodeModel; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java index 900f16662328..5928e5d294fb 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java @@ -58,16 +58,16 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCClientInstallation.java b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCClientInstallation.java index 201c17f92aaa..f39b101670d0 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCClientInstallation.java @@ -35,8 +35,8 @@ import org.keycloak.services.managers.ClientManager; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URI; import java.util.Iterator; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientCliInstallation.java b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientCliInstallation.java index 446cf814e6f5..f429379755a4 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientCliInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientCliInstallation.java @@ -26,8 +26,8 @@ import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientInstallation.java b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientInstallation.java index bde96077ee9d..0a2ad944b223 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientInstallation.java @@ -25,8 +25,8 @@ import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/par/clientpolicy/context/PushedAuthorizationRequestContext.java b/services/src/main/java/org/keycloak/protocol/oidc/par/clientpolicy/context/PushedAuthorizationRequestContext.java index da84abcf4f4b..16e8b49c0fa4 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/par/clientpolicy/context/PushedAuthorizationRequestContext.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/par/clientpolicy/context/PushedAuthorizationRequestContext.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.par.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequest; import org.keycloak.services.clientpolicy.ClientPolicyContext; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/AbstractParEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/AbstractParEndpoint.java index b04d0071f8d4..53688c011568 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/AbstractParEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/AbstractParEndpoint.java @@ -21,7 +21,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.keycloak.OAuthErrorException; import org.keycloak.common.ClientConnection; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParEndpoint.java index 56db62f93285..de52e04d0d0b 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParEndpoint.java @@ -35,13 +35,13 @@ import org.keycloak.services.resources.Cors; import org.keycloak.utils.ProfileHelper; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import static org.keycloak.protocol.oidc.OIDCLoginProtocol.REQUEST_URI_PARAM; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParRootEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParRootEndpoint.java index 3b07b6fed2c3..f8b9dd3a036b 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParRootEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParRootEndpoint.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.par.endpoints; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.keycloak.common.Profile; import org.keycloak.events.EventBuilder; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/ParEndpointRequestParserProcessor.java b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/ParEndpointRequestParserProcessor.java index 78f3e9ef7eb8..1efdf24feef6 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/ParEndpointRequestParserProcessor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/ParEndpointRequestParserProcessor.java @@ -20,8 +20,8 @@ import java.util.HashSet; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.keycloak.common.Profile; import org.keycloak.common.util.StreamUtil; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/AuthorizeClientUtil.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/AuthorizeClientUtil.java index 9d6628f4b344..5adeb11af64e 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/AuthorizeClientUtil.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/AuthorizeClientUtil.java @@ -33,8 +33,8 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.Cors; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import java.util.Map; /** diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/LogoutUtil.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/LogoutUtil.java index 27198d9bf7d2..dd88b21de790 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/LogoutUtil.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/LogoutUtil.java @@ -20,8 +20,8 @@ import java.net.URI; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.models.Constants; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCRedirectUriBuilder.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCRedirectUriBuilder.java index 455dc1be3ed9..513cb0453aa9 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCRedirectUriBuilder.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCRedirectUriBuilder.java @@ -31,8 +31,8 @@ import org.keycloak.representations.AuthorizationResponseToken; import org.keycloak.services.Urls; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.HashMap; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/PkceUtils.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/PkceUtils.java index d37601f4d9f6..cf4b75b397d7 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/PkceUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/PkceUtils.java @@ -16,7 +16,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class PkceUtils { diff --git a/services/src/main/java/org/keycloak/protocol/openshift/OpenShiftTokenReviewEndpoint.java b/services/src/main/java/org/keycloak/protocol/openshift/OpenShiftTokenReviewEndpoint.java index 9a2a9e01fdc8..5562bd4626fb 100644 --- a/services/src/main/java/org/keycloak/protocol/openshift/OpenShiftTokenReviewEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/openshift/OpenShiftTokenReviewEndpoint.java @@ -36,13 +36,13 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.Urls; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/services/src/main/java/org/keycloak/protocol/saml/JaxrsSAML2BindingBuilder.java b/services/src/main/java/org/keycloak/protocol/saml/JaxrsSAML2BindingBuilder.java index d02dca5543c1..61aa796f8b60 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/JaxrsSAML2BindingBuilder.java +++ b/services/src/main/java/org/keycloak/protocol/saml/JaxrsSAML2BindingBuilder.java @@ -26,10 +26,10 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.w3c.dom.Document; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URI; diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java index f733e45d6204..d50b5aa699a8 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java @@ -86,13 +86,13 @@ import org.keycloak.sessions.CommonClientSessionModel; import org.w3c.dom.Document; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPMessage; import java.io.IOException; import java.net.URI; import java.security.PrivateKey; diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java index a65673017025..2fa7764c9e6d 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java @@ -23,8 +23,8 @@ import java.security.PublicKey; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.keycloak.common.VerificationException; import org.keycloak.common.util.PemUtils; diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlService.java b/services/src/main/java/org/keycloak/protocol/saml/SamlService.java index 16ab5e9952c4..4beb99751ed7 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlService.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlService.java @@ -111,18 +111,18 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.*; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.*; import javax.xml.crypto.dsig.XMLSignature; import javax.xml.stream.XMLStreamWriter; import java.io.ByteArrayInputStream; @@ -140,7 +140,7 @@ import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import javax.xml.parsers.ParserConfigurationException; import static org.keycloak.common.util.StackUtil.getShortStackTrace; diff --git a/services/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java b/services/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java index b49d0a6e71dc..e98221ef5d93 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java @@ -23,11 +23,11 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.clientregistration.AbstractClientRegistrationProvider; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; /** diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java index 0265988662f1..f27559f05f16 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java @@ -27,9 +27,9 @@ import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.services.resources.RealmsResource; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; /** diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemCliInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemCliInstallation.java index 816fb4b1cfca..9e0b35a3f411 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemCliInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemCliInstallation.java @@ -27,10 +27,10 @@ import org.keycloak.protocol.saml.SamlClient; import org.keycloak.protocol.saml.SamlProtocol; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.keycloak.services.resources.RealmsResource; public class KeycloakSamlSubsystemCliInstallation implements ClientInstallationProvider { diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemInstallation.java index 48b260de56a9..d45a128f5ba7 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemInstallation.java @@ -26,8 +26,8 @@ import org.keycloak.protocol.saml.SamlClient; import org.keycloak.protocol.saml.SamlProtocol; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; /** diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/ModAuthMellonClientInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/ModAuthMellonClientInstallation.java index 9ae8b65789d0..ffc99af579d5 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/ModAuthMellonClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/ModAuthMellonClientInstallation.java @@ -27,7 +27,7 @@ import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.protocol.saml.SamlService; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.URI; diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/SamlSPDescriptorClientInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/SamlSPDescriptorClientInstallation.java index 653488a2c55b..dab8c4381532 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/SamlSPDescriptorClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/SamlSPDescriptorClientInstallation.java @@ -37,8 +37,8 @@ import java.io.StringWriter; import java.net.URI; import java.util.Collections; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import javax.xml.stream.XMLStreamWriter; diff --git a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java index 76ad0dc3b53e..aa99f767fb2b 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java +++ b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java @@ -42,9 +42,9 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.w3c.dom.Document; -import javax.ws.rs.core.Response; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPHeaderElement; +import jakarta.ws.rs.core.Response; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPHeaderElement; import java.io.IOException; import java.io.InputStream; import java.util.Objects; diff --git a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java index 76438aa6aa59..5725a7aab019 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java +++ b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java @@ -13,8 +13,8 @@ import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.List; diff --git a/services/src/main/java/org/keycloak/protocol/saml/profile/util/Soap.java b/services/src/main/java/org/keycloak/protocol/saml/profile/util/Soap.java index 5a25e20b19a2..c4898758cc11 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/profile/util/Soap.java +++ b/services/src/main/java/org/keycloak/protocol/saml/profile/util/Soap.java @@ -30,22 +30,22 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.Name; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFault; -import javax.xml.soap.MimeHeader; -import javax.xml.soap.MimeHeaders; -import javax.xml.soap.SOAPHeaderElement; -import javax.xml.soap.SOAPMessage; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.Name; +import jakarta.xml.soap.SOAPBody; +import jakarta.xml.soap.SOAPConnection; +import jakarta.xml.soap.SOAPConnectionFactory; +import jakarta.xml.soap.SOAPEnvelope; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPFault; +import jakarta.xml.soap.MimeHeader; +import jakarta.xml.soap.MimeHeaders; +import jakarta.xml.soap.SOAPHeaderElement; +import jakarta.xml.soap.SOAPMessage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/services/src/main/java/org/keycloak/services/CorsErrorResponseException.java b/services/src/main/java/org/keycloak/services/CorsErrorResponseException.java index d9beba652dd2..86f6af50ca08 100644 --- a/services/src/main/java/org/keycloak/services/CorsErrorResponseException.java +++ b/services/src/main/java/org/keycloak/services/CorsErrorResponseException.java @@ -20,9 +20,9 @@ import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.services.resources.Cors; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java index 5d00a9637d9d..a1fc106f9d41 100755 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java @@ -31,8 +31,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.urls.UrlType; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.HashMap; import java.util.Locale; diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakTransactionManager.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakTransactionManager.java index 8b081eae87f7..734efbcf132c 100755 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakTransactionManager.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakTransactionManager.java @@ -23,7 +23,7 @@ import org.keycloak.transaction.JtaTransactionManagerLookup; import org.keycloak.transaction.JtaTransactionWrapper; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import java.util.LinkedList; import java.util.List; diff --git a/services/src/main/java/org/keycloak/services/ErrorPage.java b/services/src/main/java/org/keycloak/services/ErrorPage.java index f6313a044a6c..21932326b5fd 100755 --- a/services/src/main/java/org/keycloak/services/ErrorPage.java +++ b/services/src/main/java/org/keycloak/services/ErrorPage.java @@ -20,7 +20,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/ErrorPageException.java b/services/src/main/java/org/keycloak/services/ErrorPageException.java index a773d818b635..2cf4a352b8cd 100644 --- a/services/src/main/java/org/keycloak/services/ErrorPageException.java +++ b/services/src/main/java/org/keycloak/services/ErrorPageException.java @@ -20,8 +20,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/ErrorResponse.java b/services/src/main/java/org/keycloak/services/ErrorResponse.java index 55b767bdf8e8..c157f60a7865 100755 --- a/services/src/main/java/org/keycloak/services/ErrorResponse.java +++ b/services/src/main/java/org/keycloak/services/ErrorResponse.java @@ -19,8 +19,8 @@ import org.keycloak.representations.idm.ErrorRepresentation; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/services/src/main/java/org/keycloak/services/ErrorResponseException.java b/services/src/main/java/org/keycloak/services/ErrorResponseException.java index d804b0563292..b198888c006c 100644 --- a/services/src/main/java/org/keycloak/services/ErrorResponseException.java +++ b/services/src/main/java/org/keycloak/services/ErrorResponseException.java @@ -21,9 +21,9 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.OAuth2ErrorRepresentation; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/ForbiddenException.java b/services/src/main/java/org/keycloak/services/ForbiddenException.java index 317416d1995d..89b1f048271e 100755 --- a/services/src/main/java/org/keycloak/services/ForbiddenException.java +++ b/services/src/main/java/org/keycloak/services/ForbiddenException.java @@ -19,7 +19,7 @@ import org.jboss.resteasy.spi.LoggableFailure; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * To provide a typed exception for Forbidden (This doesn't exist in Resteasy 2.3.7) diff --git a/services/src/main/java/org/keycloak/services/HttpRequestImpl.java b/services/src/main/java/org/keycloak/services/HttpRequestImpl.java index 067083d054a5..948daec8ec89 100644 --- a/services/src/main/java/org/keycloak/services/HttpRequestImpl.java +++ b/services/src/main/java/org/keycloak/services/HttpRequestImpl.java @@ -17,21 +17,21 @@ package org.keycloak.services; -import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA_TYPE; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; +import static jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA_TYPE; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import java.io.IOException; import java.io.InputStream; import java.security.cert.X509Certificate; import java.util.List; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Providers; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Providers; import org.jboss.resteasy.core.ResteasyContext; import org.jboss.resteasy.plugins.providers.multipart.InputPart; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; diff --git a/services/src/main/java/org/keycloak/services/Urls.java b/services/src/main/java/org/keycloak/services/Urls.java index 8381bf94b53c..a66f9359fafa 100755 --- a/services/src/main/java/org/keycloak/services/Urls.java +++ b/services/src/main/java/org/keycloak/services/Urls.java @@ -30,7 +30,7 @@ import org.keycloak.services.resources.ThemeResource; import org.keycloak.services.resources.admin.AdminRoot; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; /** diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/AuthorizationRequestContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/AuthorizationRequestContext.java index 566e9e8f69a2..fc340f6ba826 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/AuthorizationRequestContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/AuthorizationRequestContext.java @@ -17,7 +17,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequest; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/LogoutRequestContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/LogoutRequestContext.java index 7de124a76d6b..435f0feb292f 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/LogoutRequestContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/LogoutRequestContext.java @@ -17,8 +17,8 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyEvent; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsContext.java index e6ad76a4821a..f32203cf130c 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsContext.java @@ -17,7 +17,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyEvent; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsResponseContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsResponseContext.java index a7bccd54fa77..2646ad4c0a7a 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsResponseContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsResponseContext.java @@ -17,7 +17,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.ClientSessionContext; import org.keycloak.protocol.oidc.TokenManager; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/ServiceAccountTokenRequestContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/ServiceAccountTokenRequestContext.java index 71c5948bed92..891a62cd7406 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/ServiceAccountTokenRequestContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/ServiceAccountTokenRequestContext.java @@ -18,7 +18,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.services.clientpolicy.ClientPolicyContext; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/ServiceAccountTokenResponseContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/ServiceAccountTokenResponseContext.java index 9c46b773039b..88dfeb094566 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/ServiceAccountTokenResponseContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/ServiceAccountTokenResponseContext.java @@ -18,7 +18,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.protocol.oidc.TokenManager; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenIntrospectContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenIntrospectContext.java index acfc74b9973e..ba3a3763349b 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenIntrospectContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenIntrospectContext.java @@ -17,7 +17,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyEvent; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRefreshContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRefreshContext.java index d07873a5c37a..a6663218c620 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRefreshContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRefreshContext.java @@ -17,7 +17,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyEvent; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRefreshResponseContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRefreshResponseContext.java index 8f3f8f4c2467..bd8cc7bea1fd 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRefreshResponseContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRefreshResponseContext.java @@ -17,7 +17,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.services.clientpolicy.ClientPolicyContext; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRequestContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRequestContext.java index 933a3ed5cad8..161360cd6fd6 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRequestContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRequestContext.java @@ -17,7 +17,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.protocol.oidc.utils.OAuth2CodeParser; import org.keycloak.services.clientpolicy.ClientPolicyContext; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenResponseContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenResponseContext.java index bcd66e7e7235..2927129f8a27 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenResponseContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenResponseContext.java @@ -16,7 +16,7 @@ */ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.models.ClientSessionContext; import org.keycloak.protocol.oidc.TokenManager; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRevokeContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRevokeContext.java index 82832e5ad47c..d92f141fea41 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRevokeContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/TokenRevokeContext.java @@ -17,7 +17,7 @@ package org.keycloak.services.clientpolicy.context; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyEvent; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutor.java index 53d67eb7f8bc..0ff2f3d25038 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutor.java @@ -39,8 +39,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; public class HolderOfKeyEnforcerExecutor implements ClientPolicyExecutorProvider { diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/IntentClientBindCheckExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/IntentClientBindCheckExecutor.java index 2966481010a5..30515eff93f7 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/IntentClientBindCheckExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/IntentClientBindCheckExecutor.java @@ -21,8 +21,8 @@ import java.io.Serializable; import java.util.Optional; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/PKCEEnforcerExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/PKCEEnforcerExecutor.java index 38f2e4fda5b5..28390550bb77 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/PKCEEnforcerExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/PKCEEnforcerExecutor.java @@ -21,7 +21,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectResourceOwnerPasswordCredentialsGrantExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectResourceOwnerPasswordCredentialsGrantExecutor.java index d0d3042fca80..5e4dcc5394de 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectResourceOwnerPasswordCredentialsGrantExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectResourceOwnerPasswordCredentialsGrantExecutor.java @@ -17,7 +17,7 @@ package org.keycloak.services.clientpolicy.executor; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.OAuthErrorException; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java index c133e49b67f9..0089639875fb 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java @@ -18,7 +18,7 @@ package org.keycloak.services.clientpolicy.executor; import java.util.Optional; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.keycloak.http.HttpRequest; import org.keycloak.events.Errors; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRequestObjectExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRequestObjectExecutor.java index dadcb05ce095..85fbfd48fc16 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRequestObjectExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRequestObjectExecutor.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Optional; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java index 078a54169baa..cfb7f2e20a23 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java @@ -41,7 +41,7 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.validation.ValidationUtil; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/clientregistration/AdapterInstallationClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/AdapterInstallationClientRegistrationProvider.java index 19fcfd9bd345..fe1fd8fe9bd6 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/AdapterInstallationClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/AdapterInstallationClientRegistrationProvider.java @@ -24,12 +24,12 @@ import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationAuth.java b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationAuth.java index 269287e0ae37..12de5950fb96 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationAuth.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationAuth.java @@ -46,8 +46,8 @@ import org.keycloak.services.clientregistration.policy.RegistrationAuth; import org.keycloak.util.TokenUtil; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationService.java b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationService.java index 6a690f8b0d19..d32c6ba0b0e6 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationService.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationService.java @@ -21,10 +21,10 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.services.ErrorResponseException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Response; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java index a3e3bf6be8a5..4fb7c67ef5e4 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java @@ -23,16 +23,16 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; /** diff --git a/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java index c9d3f43bcc63..bc3fbea0afde 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java @@ -39,16 +39,16 @@ import org.keycloak.services.clientregistration.ClientRegistrationException; import org.keycloak.services.clientregistration.ErrorCodes; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/services/src/main/java/org/keycloak/services/error/KcUnrecognizedPropertyExceptionHandler.java b/services/src/main/java/org/keycloak/services/error/KcUnrecognizedPropertyExceptionHandler.java index 0087ff4d22c3..11c86f9a2217 100644 --- a/services/src/main/java/org/keycloak/services/error/KcUnrecognizedPropertyExceptionHandler.java +++ b/services/src/main/java/org/keycloak/services/error/KcUnrecognizedPropertyExceptionHandler.java @@ -20,10 +20,10 @@ import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.keycloak.models.KeycloakSession; /** diff --git a/services/src/main/java/org/keycloak/services/error/KeycloakErrorHandler.java b/services/src/main/java/org/keycloak/services/error/KeycloakErrorHandler.java index 596f24454f12..7de50ff7313e 100644 --- a/services/src/main/java/org/keycloak/services/error/KeycloakErrorHandler.java +++ b/services/src/main/java/org/keycloak/services/error/KeycloakErrorHandler.java @@ -21,11 +21,11 @@ import org.keycloak.utils.MediaType; import org.keycloak.utils.MediaTypeMatcher; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import java.io.IOException; import java.util.HashMap; import java.util.Locale; @@ -71,7 +71,7 @@ public static Response getResponse(KeycloakSession session, Throwable throwable) error.setError(getErrorCode(throwable)); return Response.status(statusCode) - .header(HttpHeaders.CONTENT_TYPE, javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE.toString()) + .header(HttpHeaders.CONTENT_TYPE, jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE.toString()) .entity(error) .build(); } diff --git a/services/src/main/java/org/keycloak/services/filters/KeycloakSecurityHeadersFilter.java b/services/src/main/java/org/keycloak/services/filters/KeycloakSecurityHeadersFilter.java index 1c1cb805fe71..50c455b56abc 100644 --- a/services/src/main/java/org/keycloak/services/filters/KeycloakSecurityHeadersFilter.java +++ b/services/src/main/java/org/keycloak/services/filters/KeycloakSecurityHeadersFilter.java @@ -20,11 +20,12 @@ import org.keycloak.headers.SecurityHeadersProvider; import org.keycloak.models.KeycloakSession; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.PreMatching; +import jakarta.ws.rs.container.ContainerRequestContext; + +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.PreMatching; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java b/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java index 776b2a02c482..2e992200f354 100755 --- a/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java @@ -16,7 +16,7 @@ */ package org.keycloak.services.managers; -import javax.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.NotAuthorizedException; import org.keycloak.common.ClientConnection; import org.keycloak.common.util.ObjectUtil; @@ -24,8 +24,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import java.util.regex.Pattern; /** diff --git a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java index 72320856ba07..85efcfc08f68 100755 --- a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java @@ -90,12 +90,12 @@ import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.TokenUtil; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLDecoder; diff --git a/services/src/main/java/org/keycloak/services/managers/AuthenticationSessionManager.java b/services/src/main/java/org/keycloak/services/managers/AuthenticationSessionManager.java index ea996b1d00d2..2c26caff058d 100644 --- a/services/src/main/java/org/keycloak/services/managers/AuthenticationSessionManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AuthenticationSessionManager.java @@ -30,7 +30,7 @@ import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.sessions.StickySessionEncoderProvider; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; import java.util.List; import java.util.Objects; import java.util.Set; diff --git a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java index 97ea009379c7..634037f2e249 100755 --- a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java +++ b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java @@ -46,8 +46,8 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.services.util.ResolveRelative; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; import java.util.ArrayList; diff --git a/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java b/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java index 40ec7f4f9aa2..aa5f33a0e02c 100755 --- a/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java +++ b/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java @@ -34,14 +34,14 @@ import org.keycloak.services.messages.Messages; import org.keycloak.util.TokenUtil; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.Set; diff --git a/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java b/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java index 53e742a4ee19..81d2fb704e9b 100755 --- a/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java +++ b/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java @@ -19,7 +19,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.spi.BadRequestException; import org.keycloak.http.HttpRequest; -import javax.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.NotAuthorizedException; import org.keycloak.OAuthErrorException; import org.keycloak.common.ClientConnection; import org.keycloak.common.util.Time; @@ -35,15 +35,15 @@ import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.services.ForbiddenException; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; /** * @author Marek Posolda @@ -169,7 +169,7 @@ protected ClientModel authorizeClient() { if (client.isPublicClient()) { OAuth2ErrorRepresentation errorRep = new OAuth2ErrorRepresentation(OAuthErrorException.INVALID_CLIENT, "Public clients not allowed"); event.error(Errors.INVALID_CLIENT); - throw new BadRequestException("Public clients not allowed", javax.ws.rs.core.Response.status(javax.ws.rs.core.Response.Status.BAD_REQUEST).entity(errorRep).type(MediaType.APPLICATION_JSON_TYPE).build()); + throw new BadRequestException("Public clients not allowed", jakarta.ws.rs.core.Response.status(jakarta.ws.rs.core.Response.Status.BAD_REQUEST).entity(errorRep).type(MediaType.APPLICATION_JSON_TYPE).build()); } return client; @@ -180,7 +180,7 @@ protected String getClientClusterHost(MultivaluedMap formData) { if (clientClusterHost == null || clientClusterHost.length() == 0) { OAuth2ErrorRepresentation errorRep = new OAuth2ErrorRepresentation( OAuthErrorException.INVALID_REQUEST, "Client cluster host not specified"); event.error(Errors.INVALID_CODE); - throw new BadRequestException("Cluster host not specified", javax.ws.rs.core.Response.status(javax.ws.rs.core.Response.Status.BAD_REQUEST).entity(errorRep).type(MediaType.APPLICATION_JSON_TYPE).build()); + throw new BadRequestException("Cluster host not specified", jakarta.ws.rs.core.Response.status(jakarta.ws.rs.core.Response.Status.BAD_REQUEST).entity(errorRep).type(MediaType.APPLICATION_JSON_TYPE).build()); } return clientClusterHost; diff --git a/services/src/main/java/org/keycloak/services/resources/Cors.java b/services/src/main/java/org/keycloak/services/resources/Cors.java index 8c03cc86c85b..3acb34f556d5 100755 --- a/services/src/main/java/org/keycloak/services/resources/Cors.java +++ b/services/src/main/java/org/keycloak/services/resources/Cors.java @@ -22,8 +22,8 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.jboss.logging.Logger; import org.keycloak.http.HttpRequest; import org.keycloak.common.util.CollectionUtil; diff --git a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java index 059cd5243ffe..53f071822de3 100755 --- a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java +++ b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java @@ -91,18 +91,18 @@ import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; import java.nio.charset.StandardCharsets; diff --git a/services/src/main/java/org/keycloak/services/resources/JsResource.java b/services/src/main/java/org/keycloak/services/resources/JsResource.java index 58d7374700b3..f34f09dfa3d5 100755 --- a/services/src/main/java/org/keycloak/services/resources/JsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/JsResource.java @@ -24,14 +24,14 @@ import org.keycloak.services.util.CacheControlUtil; import org.keycloak.utils.MediaType; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import java.io.InputStream; /** diff --git a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java index 2b80ef491d77..aae1726bcef0 100644 --- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java +++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java @@ -53,9 +53,9 @@ import org.keycloak.transaction.JtaTransactionManagerLookup; import org.keycloak.util.JsonSerialization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.ws.rs.core.Application; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.ws.rs.core.Application; import java.io.File; import java.io.FileInputStream; diff --git a/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java b/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java index 1ce1ef812c3f..8db2dd0b22a7 100755 --- a/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java +++ b/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java @@ -86,19 +86,19 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceException.java b/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceException.java index 3e758dfdf2a9..92c736e36ee5 100644 --- a/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceException.java +++ b/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceException.java @@ -17,7 +17,7 @@ package org.keycloak.services.resources; import org.keycloak.common.VerificationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * diff --git a/services/src/main/java/org/keycloak/services/resources/LogoutSessionCodeChecks.java b/services/src/main/java/org/keycloak/services/resources/LogoutSessionCodeChecks.java index 182f7b25dc19..6b9dc653485a 100644 --- a/services/src/main/java/org/keycloak/services/resources/LogoutSessionCodeChecks.java +++ b/services/src/main/java/org/keycloak/services/resources/LogoutSessionCodeChecks.java @@ -20,8 +20,8 @@ import java.net.URI; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.keycloak.http.HttpRequest; import org.keycloak.common.ClientConnection; diff --git a/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java b/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java index 8c1d2417ec7c..f2e2196c1e08 100755 --- a/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java +++ b/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java @@ -27,13 +27,13 @@ import org.keycloak.representations.idm.PublishedRealmRepresentation; import org.keycloak.services.resources.account.AccountFormService; -import javax.ws.rs.GET; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; /** * Resource class for public realm information diff --git a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java index 572fdb6e65ed..46ab7d0f33d3 100755 --- a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java @@ -40,18 +40,18 @@ import org.keycloak.wellknown.WellKnownProvider; import org.keycloak.wellknown.WellKnownProviderFactory; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; import java.util.Comparator; diff --git a/services/src/main/java/org/keycloak/services/resources/RobotsResource.java b/services/src/main/java/org/keycloak/services/resources/RobotsResource.java index b4c37719cc97..d732d41f17a1 100755 --- a/services/src/main/java/org/keycloak/services/resources/RobotsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/RobotsResource.java @@ -19,9 +19,9 @@ import org.keycloak.utils.MediaType; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/robots.txt") public class RobotsResource { diff --git a/services/src/main/java/org/keycloak/services/resources/SessionCodeChecks.java b/services/src/main/java/org/keycloak/services/resources/SessionCodeChecks.java index 99af4935dbbd..854b242bd801 100644 --- a/services/src/main/java/org/keycloak/services/resources/SessionCodeChecks.java +++ b/services/src/main/java/org/keycloak/services/resources/SessionCodeChecks.java @@ -22,10 +22,10 @@ import java.net.URI; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.keycloak.http.HttpRequest; diff --git a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java index 8b1a2d866e60..2ef870857f40 100644 --- a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java @@ -25,11 +25,11 @@ import org.keycloak.services.util.CacheControlUtil; import org.keycloak.theme.Theme; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import java.io.File; import java.io.InputStream; diff --git a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java index 00b00e0a2c44..c0058959d7dc 100755 --- a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java @@ -34,20 +34,20 @@ import org.keycloak.urls.UrlType; import org.keycloak.utils.MediaType; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response.Status; import java.io.IOException; import java.io.InputStream; import java.net.InetAddress; diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java b/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java index a662d4836300..7e91719117b9 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java @@ -12,11 +12,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.authentication.requiredactions.DeleteAccount; import org.keycloak.common.Profile; diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java b/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java index 9d8628e5606d..76805d1f6906 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java @@ -27,16 +27,16 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.utils.MediaType; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Collections; import java.util.Comparator; @@ -158,7 +158,7 @@ public CredentialTypeMetadata getMetadata() { */ @GET @NoCache - @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON) + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) public Stream credentialTypes(@QueryParam(TYPE) String type, @QueryParam(USER_CREDENTIALS) Boolean userCredentials) { auth.requireOneOf(AccountRoles.MANAGE_ACCOUNT, AccountRoles.VIEW_PROFILE); diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountFormService.java b/services/src/main/java/org/keycloak/services/resources/account/AccountFormService.java index eb0257c59ce1..0d4371d82245 100755 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountFormService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountFormService.java @@ -85,21 +85,21 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.utils.CredentialHelper; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.io.IOException; import java.lang.reflect.Method; import java.net.URI; diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java b/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java index 6db726a1d8a0..6e3abfb5d7b4 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java @@ -31,16 +31,16 @@ import org.keycloak.services.resources.Cors; import org.keycloak.theme.Theme; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriInfo; import java.io.IOException; import java.util.List; diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java b/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java index bb4c83e6906f..1b8189a8c0a4 100755 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java @@ -33,20 +33,20 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.http.HttpRequest; diff --git a/services/src/main/java/org/keycloak/services/resources/account/CorsPreflightService.java b/services/src/main/java/org/keycloak/services/resources/account/CorsPreflightService.java index 084094762707..18c102f5b371 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/CorsPreflightService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/CorsPreflightService.java @@ -3,9 +3,9 @@ import org.keycloak.http.HttpRequest; import org.keycloak.services.resources.Cors; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; /** * Created by st on 21/03/17. diff --git a/services/src/main/java/org/keycloak/services/resources/account/LinkedAccountsResource.java b/services/src/main/java/org/keycloak/services/resources/account/LinkedAccountsResource.java index b4121ebb4a22..60659e8c398c 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/LinkedAccountsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/account/LinkedAccountsResource.java @@ -27,15 +27,15 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.logging.Logger; import org.keycloak.http.HttpRequest; import org.keycloak.broker.social.SocialIdentityProvider; diff --git a/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java b/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java index 61dad0f94439..b9f701d84007 100755 --- a/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java +++ b/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java @@ -16,14 +16,14 @@ */ package org.keycloak.services.resources.account; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; diff --git a/services/src/main/java/org/keycloak/services/resources/account/resources/ResourceService.java b/services/src/main/java/org/keycloak/services/resources/account/resources/ResourceService.java index 20b0dd2a8a2b..84bab5f23032 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/resources/ResourceService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/resources/ResourceService.java @@ -16,15 +16,15 @@ */ package org.keycloak.services.resources.account.resources; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import java.util.Calendar; import java.util.Collection; import java.util.Collections; diff --git a/services/src/main/java/org/keycloak/services/resources/account/resources/ResourcesService.java b/services/src/main/java/org/keycloak/services/resources/account/resources/ResourcesService.java index f1fd428c50c2..584fbd4b3120 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/resources/ResourcesService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/resources/ResourcesService.java @@ -16,15 +16,15 @@ */ package org.keycloak.services.resources.account.resources; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Collection; import java.util.EnumMap; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java index 0d4b3795665d..298b7c5fa3b3 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java @@ -21,7 +21,7 @@ import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.Config; import org.keycloak.common.ClientConnection; import org.keycloak.common.Version; @@ -47,12 +47,12 @@ import org.keycloak.urls.UrlType; import org.keycloak.utils.MediaType; -import javax.ws.rs.GET; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminCorsPreflightService.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminCorsPreflightService.java index 35074bfb1fca..3d8aa0ca6639 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminCorsPreflightService.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminCorsPreflightService.java @@ -3,9 +3,9 @@ import org.keycloak.http.HttpRequest; import org.keycloak.services.resources.Cors; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; /** * Created by st on 21/03/17. diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java index 0609884814e4..36da8d641b77 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java @@ -32,7 +32,7 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java index 05bf235a2f85..8c12500f3585 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java @@ -19,8 +19,8 @@ import org.jboss.logging.Logger; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.NotAuthorizedException; import org.keycloak.common.Profile; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; @@ -38,16 +38,16 @@ import org.keycloak.theme.Theme; import org.keycloak.urls.UrlType; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import java.io.IOException; import java.util.Locale; import java.util.Properties; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java b/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java index 4759caf27561..2dfad6926149 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java @@ -29,13 +29,13 @@ import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import java.util.HashMap; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java index a2f0a0fb68e0..2c9df0efec01 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java @@ -18,8 +18,8 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.authentication.AuthenticationFlow; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.ClientAuthenticator; @@ -55,17 +55,17 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; import org.keycloak.utils.CredentialHelper; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; @@ -78,7 +78,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import org.keycloak.utils.ReservedCharValidator; /** diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java index 9859c44c4376..883dd126a619 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java @@ -18,8 +18,8 @@ package org.keycloak.services.resources.admin; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotAcceptableException; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotAcceptableException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.PemUtils; @@ -44,15 +44,15 @@ import org.keycloak.util.JWKSUtils; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java index 9c80902b4bbb..4f0f1d2013c2 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java @@ -28,16 +28,16 @@ import org.keycloak.services.clientregistration.ClientRegistrationTokenUtils; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.stream.Stream; /** diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java index 2009c5aaaf20..6390a842d02a 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java @@ -17,13 +17,13 @@ package org.keycloak.services.resources.admin; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java index 95544f1e71a6..8469e415a599 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java @@ -17,14 +17,14 @@ package org.keycloak.services.resources.admin; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java index bdd548e7a87a..b545ab90261d 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java @@ -29,10 +29,10 @@ import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyFactory; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.List; import java.util.stream.Stream; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java index 65e5e87bc0c1..59673bd9a2f3 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java @@ -16,7 +16,7 @@ */ package org.keycloak.services.resources.admin; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.BadRequestException; @@ -72,18 +72,18 @@ import org.keycloak.utils.ReservedCharValidator; import org.keycloak.validation.ValidationUtil; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -373,7 +373,7 @@ private void addDefaultClientScope(String clientScopeId, boolean defaultScope) { ClientScopeModel clientScope = realm.getClientScopeById(clientScopeId); if (clientScope == null) { - throw new javax.ws.rs.NotFoundException("Client scope not found"); + throw new jakarta.ws.rs.NotFoundException("Client scope not found"); } if (defaultScope && clientScope.isDynamicScope()) { throw new ErrorResponseException("invalid_request", "Can't assign a Dynamic Scope to a Client as a Default Scope", Response.Status.BAD_REQUEST); @@ -392,7 +392,7 @@ public void removeDefaultClientScope(@PathParam("clientScopeId") String clientSc ClientScopeModel clientScope = realm.getClientScopeById(clientScopeId); if (clientScope == null) { - throw new javax.ws.rs.NotFoundException("Client scope not found"); + throw new jakarta.ws.rs.NotFoundException("Client scope not found"); } client.removeClientScope(clientScope); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java index 03f6e4d34252..ae5b9aee84e4 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java @@ -19,7 +19,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -34,17 +34,17 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.storage.ReadOnlyException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.util.List; import java.util.function.Function; import java.util.function.Predicate; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java index cb9dc9873d88..092efb854446 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java @@ -24,14 +24,14 @@ import java.util.function.BiFunction; import java.util.stream.Stream; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriInfo; import com.fasterxml.jackson.annotation.JsonProperty; import org.jboss.logging.Logger; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java index dcc0169b8ebc..d804bb1b7245 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java @@ -22,10 +22,10 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java index 52066fedbec0..ebbbe6d096ee 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java @@ -34,14 +34,14 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Optional; import java.util.regex.Pattern; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java index fcdae8682874..5bbbea2aabe3 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java @@ -30,15 +30,15 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.stream.Stream; /** diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java index f99edad250d0..d9ef850cbb00 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java @@ -43,17 +43,17 @@ import org.keycloak.utils.SearchQueryUtils; import org.keycloak.validation.ValidationUtil; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Map; import java.util.stream.Stream; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java index 4ac49fc1f734..fcc35ec0e92c 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java @@ -18,7 +18,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.common.ClientConnection; import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; @@ -42,19 +42,19 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; import org.keycloak.utils.LockObjectsForModification; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.text.MessageFormat; import java.util.Arrays; import java.util.List; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java index 6c766f80e4e6..f5a95566492c 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java @@ -17,7 +17,7 @@ package org.keycloak.services.resources.admin; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.common.util.ObjectUtil; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -36,16 +36,16 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; import org.keycloak.services.resources.admin.permissions.AdminPermissions; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.HashSet; import java.util.List; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java index 4460e1758d54..76a9f2cdc119 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java @@ -17,7 +17,7 @@ package org.keycloak.services.resources.admin; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.common.util.ObjectUtil; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -31,16 +31,16 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; import org.keycloak.utils.SearchQueryUtils; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.HashMap; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java index f30971eee3c3..c818d93c6acc 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java @@ -16,12 +16,12 @@ */ package org.keycloak.services.resources.admin; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import com.google.common.collect.Streams; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.broker.provider.IdentityProviderMapper; @@ -49,17 +49,17 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; import org.keycloak.services.resources.admin.permissions.AdminPermissions; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -103,7 +103,7 @@ public IdentityProviderRepresentation getIdentityProvider() { this.auth.realm().requireViewIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } IdentityProviderRepresentation rep = ModelToRepresentation.toRepresentation(realm, this.identityProviderModel); @@ -121,7 +121,7 @@ public Response delete() { this.auth.realm().requireManageIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } String alias = this.identityProviderModel.getAlias(); @@ -149,7 +149,7 @@ public Response update(IdentityProviderRepresentation providerRep) { this.auth.realm().requireManageIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } try { @@ -254,7 +254,7 @@ public Response export(@QueryParam("format") String format) { this.auth.realm().requireViewIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } try { @@ -275,7 +275,7 @@ public Map getMapperTypes() { this.auth.realm().requireViewIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } KeycloakSessionFactory sessionFactory = session.getKeycloakSessionFactory(); @@ -312,7 +312,7 @@ public Stream getMappers() { this.auth.realm().requireViewIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } return realm.getIdentityProviderMappersByAliasStream(identityProviderModel.getAlias()) @@ -332,7 +332,7 @@ public Response addMapper(IdentityProviderMapperRepresentation mapper) { this.auth.realm().requireManageIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } IdentityProviderMapperModel model = RepresentationToModel.toModel(mapper); @@ -363,7 +363,7 @@ public IdentityProviderMapperRepresentation getMapperById(@PathParam("id") Strin this.auth.realm().requireViewIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } IdentityProviderMapperModel model = realm.getIdentityProviderMapperById(id); @@ -385,7 +385,7 @@ public void update(@PathParam("id") String id, IdentityProviderMapperRepresentat this.auth.realm().requireManageIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } IdentityProviderMapperModel model = realm.getIdentityProviderMapperById(id); @@ -408,7 +408,7 @@ public void delete(@PathParam("id") String id) { this.auth.realm().requireManageIdentityProviders(); if (identityProviderModel == null) { - throw new javax.ws.rs.NotFoundException(); + throw new jakarta.ws.rs.NotFoundException(); } IdentityProviderMapperModel model = realm.getIdentityProviderMapperById(id); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java index afe201b2c2f3..17cbd36441a8 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java @@ -38,23 +38,23 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.io.InputStream; import java.util.Map; import java.util.Objects; import java.util.stream.Stream; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import org.keycloak.utils.ReservedCharValidator; /** diff --git a/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java b/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java index 398666734123..b2fa8e012aa0 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java @@ -25,9 +25,9 @@ import org.keycloak.representations.idm.KeysMetadataRepresentation; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java index 69fa8102e1bc..9cc37f0fbea6 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java @@ -20,7 +20,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.KeycloakSession; @@ -37,16 +37,16 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.text.MessageFormat; import java.util.List; import java.util.Objects; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java index f2795df302bd..36d693f766f6 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java @@ -31,23 +31,23 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.StreamingOutput; import com.fasterxml.jackson.core.type.TypeReference; @@ -1123,7 +1123,7 @@ public KeyResource keys() { @GET @Path("credential-registrators") @NoCache - @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON) + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) public Stream getCredentialRegistrators(){ auth.realm().requireViewRealm(); return session.getContext().getRealm().getRequiredActionProvidersStream() diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java index 0a41e7036472..2a6df105e548 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java @@ -31,19 +31,19 @@ import java.util.HashMap; import java.util.stream.Stream; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java index 961c60da1a1c..18dba93b3622 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java @@ -39,18 +39,18 @@ import org.keycloak.storage.DatastoreProvider; import org.keycloak.storage.ExportImportManager; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.InputStream; import java.net.URI; import java.util.Arrays; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java index e8927fb0fb09..000b90ea1a3b 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java @@ -18,7 +18,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientModel; @@ -34,17 +34,17 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; import org.keycloak.services.resources.admin.permissions.AdminPermissions; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.stream.Stream; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java index 2dd31386f718..97cb3450f721 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java @@ -18,7 +18,7 @@ package org.keycloak.services.resources.admin; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientModel; @@ -41,20 +41,20 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionManagement; import org.keycloak.services.resources.admin.permissions.AdminPermissions; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java index eb56a82be687..d9bca8cc392d 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java @@ -19,7 +19,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.common.ClientConnection; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -38,18 +38,18 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; import org.keycloak.storage.ReadOnlyException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java index ed84e2e34380..fba5835f4e41 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java @@ -27,8 +27,8 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.UriInfo; import java.util.HashSet; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java index b134c792226c..7fe0f285d1a8 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java @@ -18,7 +18,7 @@ package org.keycloak.services.resources.admin; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientModel; @@ -31,15 +31,15 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import java.util.List; import java.util.function.Function; import java.util.function.Predicate; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java index 67165b7556ac..7dc8a8dec003 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java @@ -18,7 +18,7 @@ package org.keycloak.services.resources.admin; import org.jboss.resteasy.annotations.cache.NoCache; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientModel; @@ -33,16 +33,16 @@ import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator; import org.keycloak.services.util.ScopeMappedUtil; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java index eb507930f362..ac92cf94abdc 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java @@ -16,12 +16,12 @@ */ package org.keycloak.services.resources.admin; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.component.ComponentValidationException; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java index 5a602b682a17..b064f10cab5c 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java @@ -80,23 +80,23 @@ import org.keycloak.userprofile.ValidationException; import org.keycloak.utils.ProfileHelper; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java index f1b94011ada3..e57335ae7b51 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java @@ -43,18 +43,18 @@ import org.keycloak.userprofile.UserProfileProvider; import org.keycloak.utils.SearchQueryUtils; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java index 3ef6a7b94f26..9812ba645c2e 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java @@ -54,10 +54,10 @@ import org.keycloak.representations.info.ThemeInfoRepresentation; import org.keycloak.theme.Theme; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; import java.io.IOException; import java.util.Arrays; import java.util.Collections; diff --git a/services/src/main/java/org/keycloak/services/util/AuthenticationFlowURLHelper.java b/services/src/main/java/org/keycloak/services/util/AuthenticationFlowURLHelper.java index 5c2c2164de9c..5b9007c960d9 100644 --- a/services/src/main/java/org/keycloak/services/util/AuthenticationFlowURLHelper.java +++ b/services/src/main/java/org/keycloak/services/util/AuthenticationFlowURLHelper.java @@ -19,9 +19,9 @@ import java.net.URI; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationProcessor; diff --git a/services/src/main/java/org/keycloak/services/util/BrowserHistoryHelper.java b/services/src/main/java/org/keycloak/services/util/BrowserHistoryHelper.java index 6aeb47e56388..58b739a4df75 100644 --- a/services/src/main/java/org/keycloak/services/util/BrowserHistoryHelper.java +++ b/services/src/main/java/org/keycloak/services/util/BrowserHistoryHelper.java @@ -21,7 +21,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.keycloak.http.HttpRequest; diff --git a/services/src/main/java/org/keycloak/services/util/CacheControlUtil.java b/services/src/main/java/org/keycloak/services/util/CacheControlUtil.java index 5e6e7a970505..8e68b280f394 100755 --- a/services/src/main/java/org/keycloak/services/util/CacheControlUtil.java +++ b/services/src/main/java/org/keycloak/services/util/CacheControlUtil.java @@ -22,7 +22,7 @@ import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; -import javax.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.CacheControl; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/util/CookieHelper.java b/services/src/main/java/org/keycloak/services/util/CookieHelper.java index 8a4c6fa6746c..a90ffc610977 100755 --- a/services/src/main/java/org/keycloak/services/util/CookieHelper.java +++ b/services/src/main/java/org/keycloak/services/util/CookieHelper.java @@ -23,8 +23,8 @@ import org.jboss.resteasy.util.CookieParser; import org.keycloak.models.KeycloakSession; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; import java.util.Collections; import java.util.HashSet; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/util/ObjectMapperResolver.java b/services/src/main/java/org/keycloak/services/util/ObjectMapperResolver.java index 416129d6836d..51f85e37e3fa 100644 --- a/services/src/main/java/org/keycloak/services/util/ObjectMapperResolver.java +++ b/services/src/main/java/org/keycloak/services/util/ObjectMapperResolver.java @@ -25,8 +25,8 @@ import com.fasterxml.jackson.databind.type.TypeFactory; import com.fasterxml.jackson.datatype.jdk8.StreamSerializer; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; import java.util.stream.Stream; /** diff --git a/services/src/main/java/org/keycloak/services/util/ResolveRelative.java b/services/src/main/java/org/keycloak/services/util/ResolveRelative.java index 21d6fcab132a..91dc93c4d27a 100755 --- a/services/src/main/java/org/keycloak/services/util/ResolveRelative.java +++ b/services/src/main/java/org/keycloak/services/util/ResolveRelative.java @@ -21,7 +21,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.urls.UrlType; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/social/bitbucket/BitbucketIdentityProvider.java b/services/src/main/java/org/keycloak/social/bitbucket/BitbucketIdentityProvider.java index 91ee36d789b6..9da0dc31d607 100755 --- a/services/src/main/java/org/keycloak/social/bitbucket/BitbucketIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/bitbucket/BitbucketIdentityProvider.java @@ -32,7 +32,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.services.ErrorResponseException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; /** diff --git a/services/src/main/java/org/keycloak/social/gitlab/GitLabIdentityProvider.java b/services/src/main/java/org/keycloak/social/gitlab/GitLabIdentityProvider.java index e16ef24b8071..28ed96f17f68 100755 --- a/services/src/main/java/org/keycloak/social/gitlab/GitLabIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/gitlab/GitLabIdentityProvider.java @@ -36,8 +36,8 @@ import org.keycloak.representations.JsonWebToken; import org.keycloak.services.ErrorResponseException; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.io.IOException; /** diff --git a/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java b/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java index fa6752efc680..62dcc699ba0a 100755 --- a/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java @@ -29,8 +29,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.representations.JsonWebToken; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; import java.util.Arrays; /** diff --git a/services/src/main/java/org/keycloak/social/openshift/OpenshiftV3IdentityProvider.java b/services/src/main/java/org/keycloak/social/openshift/OpenshiftV3IdentityProvider.java index 58ff206ced67..ff7ddb79c222 100644 --- a/services/src/main/java/org/keycloak/social/openshift/OpenshiftV3IdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/openshift/OpenshiftV3IdentityProvider.java @@ -14,7 +14,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.services.ErrorResponseException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URLEncoder; import java.util.Optional; diff --git a/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java b/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java index 7b58b6e016f0..58464ed6daa4 100755 --- a/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java @@ -52,14 +52,14 @@ import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; -import javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; /** diff --git a/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java b/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java index 2c163df61bae..025691f8261e 100755 --- a/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java +++ b/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java @@ -19,7 +19,7 @@ import org.keycloak.models.RealmModel; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.util.List; import java.util.Properties; import java.util.stream.Collectors; diff --git a/services/src/main/java/org/keycloak/transaction/AsyncResponseTransaction.java b/services/src/main/java/org/keycloak/transaction/AsyncResponseTransaction.java index ebcf356510a9..267a69c81adf 100644 --- a/services/src/main/java/org/keycloak/transaction/AsyncResponseTransaction.java +++ b/services/src/main/java/org/keycloak/transaction/AsyncResponseTransaction.java @@ -6,8 +6,8 @@ import org.keycloak.services.ErrorPage; import org.keycloak.services.messages.Messages; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.core.Response; /** * When using {@link AsyncResponse#resume(Object)} directly in the code, the response is returned before all changes diff --git a/services/src/main/java/org/keycloak/transaction/JBossJtaTransactionManagerLookup.java b/services/src/main/java/org/keycloak/transaction/JBossJtaTransactionManagerLookup.java index 2f3e89590614..a53f20dc94a9 100644 --- a/services/src/main/java/org/keycloak/transaction/JBossJtaTransactionManagerLookup.java +++ b/services/src/main/java/org/keycloak/transaction/JBossJtaTransactionManagerLookup.java @@ -22,7 +22,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/transaction/JtaTransactionWrapper.java b/services/src/main/java/org/keycloak/transaction/JtaTransactionWrapper.java index 0be162da3f6b..69ea378ae1f9 100644 --- a/services/src/main/java/org/keycloak/transaction/JtaTransactionWrapper.java +++ b/services/src/main/java/org/keycloak/transaction/JtaTransactionWrapper.java @@ -21,10 +21,10 @@ import org.keycloak.models.KeycloakTransaction; import org.keycloak.provider.ExceptionConverter; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; import java.util.Objects; /** diff --git a/services/src/main/java/org/keycloak/transaction/UserTransactionWrapper.java b/services/src/main/java/org/keycloak/transaction/UserTransactionWrapper.java index 52bb9138b9fa..941eb436f5c6 100644 --- a/services/src/main/java/org/keycloak/transaction/UserTransactionWrapper.java +++ b/services/src/main/java/org/keycloak/transaction/UserTransactionWrapper.java @@ -18,8 +18,8 @@ import org.keycloak.models.KeycloakTransaction; -import javax.transaction.Status; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.UserTransaction; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/url/DefaultHostnameProvider.java b/services/src/main/java/org/keycloak/url/DefaultHostnameProvider.java index c7f3c415ac56..41f9acd313d4 100644 --- a/services/src/main/java/org/keycloak/url/DefaultHostnameProvider.java +++ b/services/src/main/java/org/keycloak/url/DefaultHostnameProvider.java @@ -10,7 +10,7 @@ import org.keycloak.urls.HostnameProvider; import org.keycloak.urls.UrlType; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; import java.net.URI; public class DefaultHostnameProvider implements HostnameProvider { diff --git a/services/src/main/java/org/keycloak/url/FixedHostnameProvider.java b/services/src/main/java/org/keycloak/url/FixedHostnameProvider.java index bd618a03b3e4..09d6c3b44c87 100644 --- a/services/src/main/java/org/keycloak/url/FixedHostnameProvider.java +++ b/services/src/main/java/org/keycloak/url/FixedHostnameProvider.java @@ -4,7 +4,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.urls.HostnameProvider; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; @Deprecated public class FixedHostnameProvider implements HostnameProvider { diff --git a/services/src/main/java/org/keycloak/url/RequestHostnameProvider.java b/services/src/main/java/org/keycloak/url/RequestHostnameProvider.java index b47a09d8e738..7518358808f3 100644 --- a/services/src/main/java/org/keycloak/url/RequestHostnameProvider.java +++ b/services/src/main/java/org/keycloak/url/RequestHostnameProvider.java @@ -2,7 +2,7 @@ import org.keycloak.urls.HostnameProvider; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; @Deprecated public class RequestHostnameProvider implements HostnameProvider { diff --git a/services/src/main/java/org/keycloak/url/RequestHostnameProviderFactory.java b/services/src/main/java/org/keycloak/url/RequestHostnameProviderFactory.java index f0bdfffe59ab..4e873be7eb43 100644 --- a/services/src/main/java/org/keycloak/url/RequestHostnameProviderFactory.java +++ b/services/src/main/java/org/keycloak/url/RequestHostnameProviderFactory.java @@ -5,7 +5,7 @@ import org.keycloak.urls.HostnameProvider; import org.keycloak.urls.HostnameProviderFactory; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriInfo; @Deprecated public class RequestHostnameProviderFactory implements HostnameProviderFactory { diff --git a/services/src/main/java/org/keycloak/userprofile/validator/DuplicateEmailValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/DuplicateEmailValidator.java index 63a3da02d87c..0fd29478a88d 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/DuplicateEmailValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/DuplicateEmailValidator.java @@ -16,7 +16,7 @@ */ package org.keycloak.userprofile.validator; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/userprofile/validator/DuplicateUsernameValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/DuplicateUsernameValidator.java index 4cd00b05e1f0..206ec31d1695 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/DuplicateUsernameValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/DuplicateUsernameValidator.java @@ -16,7 +16,7 @@ */ package org.keycloak.userprofile.validator; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/userprofile/validator/EmailExistsAsUsernameValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/EmailExistsAsUsernameValidator.java index a81c6328ff64..b73c3369b815 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/EmailExistsAsUsernameValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/EmailExistsAsUsernameValidator.java @@ -16,7 +16,7 @@ */ package org.keycloak.userprofile.validator; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/userprofile/validator/RegistrationUsernameExistsValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/RegistrationUsernameExistsValidator.java index 3e94f5fea5d9..f4989b5f323f 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/RegistrationUsernameExistsValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/RegistrationUsernameExistsValidator.java @@ -16,7 +16,7 @@ */ package org.keycloak.userprofile.validator; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/utils/MediaType.java b/services/src/main/java/org/keycloak/utils/MediaType.java index 4842f384f35d..b992b3dc7039 100644 --- a/services/src/main/java/org/keycloak/utils/MediaType.java +++ b/services/src/main/java/org/keycloak/utils/MediaType.java @@ -23,25 +23,25 @@ public class MediaType { public static final String TEXT_HTML_UTF_8 = "text/html; charset=utf-8"; - public static final javax.ws.rs.core.MediaType TEXT_HTML_UTF_8_TYPE = new javax.ws.rs.core.MediaType("text", "html", "utf-8"); + public static final jakarta.ws.rs.core.MediaType TEXT_HTML_UTF_8_TYPE = new jakarta.ws.rs.core.MediaType("text", "html", "utf-8"); public static final String TEXT_PLAIN_UTF_8 = "text/plain; charset=utf-8"; - public static final javax.ws.rs.core.MediaType TEXT_PLAIN_UTF_8_TYPE = new javax.ws.rs.core.MediaType("text", "plain", "utf-8"); + public static final jakarta.ws.rs.core.MediaType TEXT_PLAIN_UTF_8_TYPE = new jakarta.ws.rs.core.MediaType("text", "plain", "utf-8"); public static final String TEXT_PLAIN_JAVASCRIPT = "text/javascript; charset=utf-8"; - public static final javax.ws.rs.core.MediaType TEXT_JAVASCRIPT_UTF_8_TYPE = new javax.ws.rs.core.MediaType("text", "javascript", "utf-8"); + public static final jakarta.ws.rs.core.MediaType TEXT_JAVASCRIPT_UTF_8_TYPE = new jakarta.ws.rs.core.MediaType("text", "javascript", "utf-8"); - public static final String APPLICATION_JSON = javax.ws.rs.core.MediaType.APPLICATION_JSON; - public static final javax.ws.rs.core.MediaType APPLICATION_JSON_TYPE = javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; + public static final String APPLICATION_JSON = jakarta.ws.rs.core.MediaType.APPLICATION_JSON; + public static final jakarta.ws.rs.core.MediaType APPLICATION_JSON_TYPE = jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; - public static final String APPLICATION_FORM_URLENCODED = javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; - public static final javax.ws.rs.core.MediaType APPLICATION_FORM_URLENCODED_TYPE = javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED_TYPE; + public static final String APPLICATION_FORM_URLENCODED = jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; + public static final jakarta.ws.rs.core.MediaType APPLICATION_FORM_URLENCODED_TYPE = jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED_TYPE; public static final String APPLICATION_JWT = "application/jwt"; - public static final javax.ws.rs.core.MediaType APPLICATION_JWT_TYPE = new javax.ws.rs.core.MediaType("application", "jwt"); + public static final jakarta.ws.rs.core.MediaType APPLICATION_JWT_TYPE = new jakarta.ws.rs.core.MediaType("application", "jwt"); - public static final String APPLICATION_XML = javax.ws.rs.core.MediaType.APPLICATION_XML; + public static final String APPLICATION_XML = jakarta.ws.rs.core.MediaType.APPLICATION_XML; - public static final String TEXT_XML = javax.ws.rs.core.MediaType.TEXT_XML; + public static final String TEXT_XML = jakarta.ws.rs.core.MediaType.TEXT_XML; } diff --git a/services/src/main/java/org/keycloak/utils/MediaTypeMatcher.java b/services/src/main/java/org/keycloak/utils/MediaTypeMatcher.java index 8fde467cb41d..c76c93b481f9 100644 --- a/services/src/main/java/org/keycloak/utils/MediaTypeMatcher.java +++ b/services/src/main/java/org/keycloak/utils/MediaTypeMatcher.java @@ -1,12 +1,12 @@ package org.keycloak.utils; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; public class MediaTypeMatcher { public static boolean isHtmlRequest(HttpHeaders headers) { - for (javax.ws.rs.core.MediaType m : headers.getAcceptableMediaTypes()) { - if (!m.isWildcardType() && m.isCompatible(javax.ws.rs.core.MediaType.TEXT_HTML_TYPE)) { + for (jakarta.ws.rs.core.MediaType m : headers.getAcceptableMediaTypes()) { + if (!m.isWildcardType() && m.isCompatible(jakarta.ws.rs.core.MediaType.TEXT_HTML_TYPE)) { return true; } } diff --git a/services/src/main/java/org/keycloak/utils/OAuth2Error.java b/services/src/main/java/org/keycloak/utils/OAuth2Error.java index 1b38ffd6e401..b2c2dfc73126 100644 --- a/services/src/main/java/org/keycloak/utils/OAuth2Error.java +++ b/services/src/main/java/org/keycloak/utils/OAuth2Error.java @@ -28,19 +28,19 @@ import java.util.Optional; import java.util.function.BiConsumer; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.keycloak.OAuthErrorException; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.services.resources.Cors; -import static javax.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE; +import static jakarta.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE; /** * @author Dmitry Telegin diff --git a/services/src/main/java/org/keycloak/utils/ProfileHelper.java b/services/src/main/java/org/keycloak/utils/ProfileHelper.java index b1a29f459305..5adf373440a6 100644 --- a/services/src/main/java/org/keycloak/utils/ProfileHelper.java +++ b/services/src/main/java/org/keycloak/utils/ProfileHelper.java @@ -19,8 +19,8 @@ import org.keycloak.common.Profile; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; /** * @author Stian Thorgersen diff --git a/services/src/test/java/org/keycloak/procotol/docker/installation/DockerComposeYamlInstallationProviderTest.java b/services/src/test/java/org/keycloak/procotol/docker/installation/DockerComposeYamlInstallationProviderTest.java index 3bcff1ba4205..9d271d883264 100644 --- a/services/src/test/java/org/keycloak/procotol/docker/installation/DockerComposeYamlInstallationProviderTest.java +++ b/services/src/test/java/org/keycloak/procotol/docker/installation/DockerComposeYamlInstallationProviderTest.java @@ -26,7 +26,7 @@ import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.io.FileUtils; import org.junit.Before; diff --git a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/BackoffRetryPolicy.java b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/BackoffRetryPolicy.java index 69f124d211b8..5a29a4df2b7d 100644 --- a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/BackoffRetryPolicy.java +++ b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/BackoffRetryPolicy.java @@ -2,7 +2,7 @@ import org.keycloak.testsuite.dballocator.client.exceptions.DBAllocatorUnavailableException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.concurrent.Callable; @FunctionalInterface diff --git a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/DBAllocatorServiceClient.java b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/DBAllocatorServiceClient.java index 48ae74cc1d56..09f282c20865 100644 --- a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/DBAllocatorServiceClient.java +++ b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/DBAllocatorServiceClient.java @@ -11,9 +11,9 @@ import org.keycloak.testsuite.dballocator.client.exceptions.DBAllocatorException; import org.keycloak.testsuite.dballocator.client.retry.IncrementalBackoffRetryPolicy; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.core.Response; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/exceptions/DBAllocatorException.java b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/exceptions/DBAllocatorException.java index 0443f69f4ead..88677a5dd5a5 100644 --- a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/exceptions/DBAllocatorException.java +++ b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/exceptions/DBAllocatorException.java @@ -1,6 +1,6 @@ package org.keycloak.testsuite.dballocator.client.exceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class DBAllocatorException extends Exception { diff --git a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/exceptions/DBAllocatorUnavailableException.java b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/exceptions/DBAllocatorUnavailableException.java index cafa5917ffcc..d414c4aa26d5 100644 --- a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/exceptions/DBAllocatorUnavailableException.java +++ b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/exceptions/DBAllocatorUnavailableException.java @@ -1,7 +1,7 @@ package org.keycloak.testsuite.dballocator.client.exceptions; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class DBAllocatorUnavailableException extends DBAllocatorException { diff --git a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/retry/IncrementalBackoffRetryPolicy.java b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/retry/IncrementalBackoffRetryPolicy.java index 5676ca84b8a7..2ecd1143d3fe 100644 --- a/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/retry/IncrementalBackoffRetryPolicy.java +++ b/testsuite/db-allocator-plugin/src/main/java/org/keycloak/testsuite/dballocator/client/retry/IncrementalBackoffRetryPolicy.java @@ -3,7 +3,7 @@ import org.keycloak.testsuite.dballocator.client.BackoffRetryPolicy; import org.keycloak.testsuite.dballocator.client.exceptions.DBAllocatorUnavailableException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.LockSupport; diff --git a/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/DBAllocatorServiceClientTest.java b/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/DBAllocatorServiceClientTest.java index b1b8003d244d..76bb840bd89a 100644 --- a/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/DBAllocatorServiceClientTest.java +++ b/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/DBAllocatorServiceClientTest.java @@ -10,7 +10,7 @@ import org.keycloak.testsuite.dballocator.client.exceptions.DBAllocatorUnavailableException; import org.keycloak.testsuite.dballocator.client.mock.MockResponse; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.InputStream; import java.nio.charset.Charset; import java.util.concurrent.TimeUnit; diff --git a/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/mock/MockResponse.java b/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/mock/MockResponse.java index e72a59de4ec5..544f9563406b 100644 --- a/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/mock/MockResponse.java +++ b/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/mock/MockResponse.java @@ -1,12 +1,12 @@ package org.keycloak.testsuite.dballocator.client.mock; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; import java.lang.annotation.Annotation; import java.net.URI; import java.util.Date; diff --git a/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/retry/IncrementalBackoffRetryPolicyTest.java b/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/retry/IncrementalBackoffRetryPolicyTest.java index c936170340fe..81054126523b 100644 --- a/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/retry/IncrementalBackoffRetryPolicyTest.java +++ b/testsuite/db-allocator-plugin/src/test/java/org/keycloak/testsuite/dballocator/client/retry/IncrementalBackoffRetryPolicyTest.java @@ -5,7 +5,7 @@ import org.keycloak.testsuite.dballocator.client.exceptions.DBAllocatorUnavailableException; import org.keycloak.testsuite.dballocator.client.retry.IncrementalBackoffRetryPolicy; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.LongAdder; diff --git a/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/UndertowAppServer.java b/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/UndertowAppServer.java index 5aca1a4c4b88..f419c4a1bca7 100644 --- a/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/UndertowAppServer.java +++ b/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/UndertowAppServer.java @@ -34,9 +34,9 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import javax.servlet.ServletException; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; +import jakarta.servlet.ServletException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/saml/util/RestSamlApplicationConfig.java b/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/saml/util/RestSamlApplicationConfig.java index 1f9084a2e3c1..5a624bcaadcb 100644 --- a/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/saml/util/RestSamlApplicationConfig.java +++ b/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/saml/util/RestSamlApplicationConfig.java @@ -18,7 +18,7 @@ package org.keycloak.testsuite.arquillian.undertow.saml.util; import java.util.Set; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; /** * Wildfly JAX-RS Integration has support for scanning deployment for annotations. diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/PushButtonAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/PushButtonAuthenticator.java index bb7dcd3266b4..574278aa900d 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/PushButtonAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/PushButtonAuthenticator.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.authentication; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/TestKeycloakOidcIdentityProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/TestKeycloakOidcIdentityProviderFactory.java index 5310051a2c70..dee4c7e4d186 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/TestKeycloakOidcIdentityProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/TestKeycloakOidcIdentityProviderFactory.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.broker.oidc; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/jpa/Company.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/jpa/Company.java index d5f95aee2971..2bba3189c7fe 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/jpa/Company.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/jpa/Company.java @@ -18,12 +18,12 @@ package org.keycloak.testsuite.domainextension.jpa; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; @Entity @Table(name = "EXAMPLE_COMPANY") diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java index c26c71f83704..0ea21613c672 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java @@ -22,15 +22,15 @@ import org.keycloak.testsuite.domainextension.CompanyRepresentation; import org.keycloak.testsuite.domainextension.spi.ExampleService; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; public class CompanyResource { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/ExampleRestResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/ExampleRestResource.java index 03049e217b35..ce0da2e34d0f 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/ExampleRestResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/ExampleRestResource.java @@ -21,9 +21,9 @@ import org.keycloak.services.managers.AppAuthManager; import org.keycloak.services.managers.AuthenticationManager; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.Path; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.Path; public class ExampleRestResource { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/impl/ExampleServiceImpl.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/impl/ExampleServiceImpl.java index 6ffaa5872e2f..1f5aeed721e5 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/impl/ExampleServiceImpl.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/impl/ExampleServiceImpl.java @@ -25,7 +25,7 @@ import org.keycloak.testsuite.domainextension.jpa.Company; import org.keycloak.testsuite.domainextension.spi.ExampleService; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.LinkedList; import java.util.List; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ClickThroughAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ClickThroughAuthenticator.java index db1e1663cb0f..4d8003a9dde8 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ClickThroughAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ClickThroughAuthenticator.java @@ -28,7 +28,7 @@ import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/SetClientNoteAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/SetClientNoteAuthenticator.java index efe9da51409e..c81d2381e8ee 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/SetClientNoteAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/SetClientNoteAuthenticator.java @@ -20,7 +20,7 @@ import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.jboss.logging.Logger; import org.keycloak.Config; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java index b21b0e9bbb2a..1b89b08026d1 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java @@ -35,16 +35,16 @@ import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource; import org.keycloak.utils.MediaType; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; @@ -173,7 +173,7 @@ public Response clearAdminActions() { } @POST - @Consumes(javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED) + @Consumes(jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED) @Produces(MediaType.TEXT_HTML_UTF_8) @Path("/{action}") public Response post(@PathParam("action") String action) { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProvider.java index 3de858cee973..c2bb73da1d01 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProvider.java @@ -28,15 +28,15 @@ import org.keycloak.services.resources.RealmsResource; import org.keycloak.utils.MediaType; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java index 2af998235b81..f4f4c18a661b 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java @@ -91,18 +91,18 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.utils.MediaType; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.Response; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -1043,7 +1043,7 @@ public Response simulatePostRequest(@QueryParam("postRequestUrl") String postReq builder.append(""); return Response.status(Response.Status.OK) - .type(javax.ws.rs.core.MediaType.TEXT_HTML_TYPE) + .type(jakarta.ws.rs.core.MediaType.TEXT_HTML_TYPE) .entity(builder.toString()).build(); } diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestCacheResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestCacheResource.java index 53fd3a4bf409..d1f042da7873 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestCacheResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestCacheResource.java @@ -24,12 +24,12 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.infinispan.Cache; import org.infinispan.client.hotrod.RemoteCache; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestJavascriptResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestJavascriptResource.java index 7bfe6d8163d0..7c461cffbd50 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestJavascriptResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestJavascriptResource.java @@ -4,10 +4,10 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.testsuite.rest.TestingResourceProvider; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestLDAPResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestLDAPResource.java index b662471e9238..79a4ca684527 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestLDAPResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestLDAPResource.java @@ -19,12 +19,12 @@ import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingExportImportResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingExportImportResource.java index 95b168320595..60e78efc70f0 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingExportImportResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingExportImportResource.java @@ -20,14 +20,14 @@ import org.keycloak.exportimport.ExportImportManager; import org.keycloak.models.KeycloakSession; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.nio.file.Files; import static org.keycloak.exportimport.ExportImportConfig.ACTION; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java index 6262a20c9219..15d80458c4b9 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java @@ -21,8 +21,8 @@ import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; @@ -64,16 +64,16 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertow.java b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertow.java index 5bbdc1bd97f5..254dc2fe62ea 100644 --- a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertow.java +++ b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertow.java @@ -60,14 +60,14 @@ import org.keycloak.util.JsonSerialization; import io.undertow.servlet.api.InstanceHandle; -import javax.servlet.DispatcherType; -import javax.servlet.ServletException; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.ServletException; import java.io.IOException; import java.lang.reflect.Field; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.Filter; +import jakarta.servlet.Filter; import org.xnio.Options; import org.xnio.SslClientAuthMode; diff --git a/testsuite/integration-arquillian/test-apps/app-profile-jee/src/main/java/org/keycloak/quickstart/profilejee/Controller.java b/testsuite/integration-arquillian/test-apps/app-profile-jee/src/main/java/org/keycloak/quickstart/profilejee/Controller.java index 2f863b913d05..8f06780330dd 100644 --- a/testsuite/integration-arquillian/test-apps/app-profile-jee/src/main/java/org/keycloak/quickstart/profilejee/Controller.java +++ b/testsuite/integration-arquillian/test-apps/app-profile-jee/src/main/java/org/keycloak/quickstart/profilejee/Controller.java @@ -17,8 +17,8 @@ package org.keycloak.quickstart.profilejee; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.KeycloakDeployment; diff --git a/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/DataApplication.java b/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/DataApplication.java index 6456904af637..46850ef8e91b 100755 --- a/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/DataApplication.java +++ b/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/DataApplication.java @@ -17,8 +17,8 @@ package org.keycloak.example.oauth; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; /** * @author Bill Burke diff --git a/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/ProductService.java b/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/ProductService.java index ddc22a04fa16..0b6ad3101195 100755 --- a/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/ProductService.java +++ b/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/ProductService.java @@ -19,11 +19,11 @@ import org.jboss.resteasy.annotations.cache.NoCache; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; import java.util.ArrayList; import java.util.List; diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/ErrorResponse.java b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/ErrorResponse.java index 51755d899ed9..d42f3ad198fe 100644 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/ErrorResponse.java +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/ErrorResponse.java @@ -1,7 +1,7 @@ package org.keycloak.example.photoz; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.Map; diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/PhotozApplication.java b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/PhotozApplication.java index 90e095151595..8d607b5831b7 100644 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/PhotozApplication.java +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/PhotozApplication.java @@ -5,8 +5,8 @@ import org.keycloak.example.photoz.album.ProfileService; import org.keycloak.example.photoz.unsecured.UnsecuredService; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import java.util.LinkedHashSet; import java.util.Set; diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/admin/AdminAlbumService.java b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/admin/AdminAlbumService.java index dff162ceef11..c2722b86c8f8 100644 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/admin/AdminAlbumService.java +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/admin/AdminAlbumService.java @@ -20,12 +20,12 @@ import org.keycloak.example.photoz.CustomDatabase; import org.keycloak.example.photoz.entity.Album; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/album/AlbumService.java b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/album/AlbumService.java index 9b1e32b26d2f..a4c47bc0f0c3 100644 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/album/AlbumService.java +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/album/AlbumService.java @@ -9,21 +9,21 @@ import org.keycloak.representations.idm.authorization.ScopeRepresentation; import org.keycloak.authorization.client.resource.ProtectionResource; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.util.HashSet; import java.util.List; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.jboss.logging.Logger; @Path("/album") diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/album/ProfileService.java b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/album/ProfileService.java index 4d664998157f..ad53ef82bf59 100644 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/album/ProfileService.java +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/album/ProfileService.java @@ -19,12 +19,12 @@ import org.keycloak.example.photoz.CustomDatabase; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; import java.security.Principal; import java.util.List; diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/entity/Album.java b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/entity/Album.java index 6eadcbfc969c..b7f35a088e8d 100644 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/entity/Album.java +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/entity/Album.java @@ -18,17 +18,17 @@ package org.keycloak.example.photoz.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; import java.util.ArrayList; import java.util.List; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; /** * @author Pedro Igor diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/entity/Photo.java b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/entity/Photo.java index 1161807a839d..8c712d2909ff 100644 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/entity/Photo.java +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/entity/Photo.java @@ -18,14 +18,14 @@ package org.keycloak.example.photoz.entity; import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; /** * @author Pedro Igor diff --git a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/unsecured/UnsecuredService.java b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/unsecured/UnsecuredService.java index 8991ea9dabb0..022d0931695a 100644 --- a/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/unsecured/UnsecuredService.java +++ b/testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/src/main/java/org/keycloak/example/photoz/unsecured/UnsecuredService.java @@ -17,10 +17,10 @@ package org.keycloak.example.photoz.unsecured; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; -import javax.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.GET; import org.jboss.logging.Logger; import org.keycloak.example.photoz.CustomDatabase; diff --git a/testsuite/integration-arquillian/test-apps/servlet-authz/src/main/java/org/keycloak/testsuite/servletauthz/TestFilter.java b/testsuite/integration-arquillian/test-apps/servlet-authz/src/main/java/org/keycloak/testsuite/servletauthz/TestFilter.java index 846f236ddd1f..dd678a9e1243 100644 --- a/testsuite/integration-arquillian/test-apps/servlet-authz/src/main/java/org/keycloak/testsuite/servletauthz/TestFilter.java +++ b/testsuite/integration-arquillian/test-apps/servlet-authz/src/main/java/org/keycloak/testsuite/servletauthz/TestFilter.java @@ -17,13 +17,13 @@ package org.keycloak.testsuite.servletauthz; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.PrintWriter; import java.util.Map; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java index 3b3cc4997fa5..677ac994fbe1 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java @@ -25,9 +25,9 @@ import org.keycloak.common.util.Time; import org.keycloak.common.util.reflections.Reflections; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.lang.reflect.Field; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/AbstractShowTokensServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/AbstractShowTokensServlet.java index b4daf27e41f4..0a5766518800 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/AbstractShowTokensServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/AbstractShowTokensServlet.java @@ -24,9 +24,9 @@ import org.keycloak.representations.RefreshToken; import org.keycloak.util.JsonSerialization; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; /** diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/BasicAuthServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/BasicAuthServlet.java index 3c51343758ca..dc6c6e84f27a 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/BasicAuthServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/BasicAuthServlet.java @@ -1,9 +1,9 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CallAuthenticatedServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CallAuthenticatedServlet.java index ad7dbe524156..185dac3294e7 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CallAuthenticatedServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CallAuthenticatedServlet.java @@ -19,10 +19,10 @@ import org.keycloak.KeycloakSecurityContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkServlet.java index 9bc68df0bd56..82db06e3d895 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkServlet.java @@ -21,11 +21,11 @@ import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.representations.AccessToken; -import javax.servlet.annotation.WebServlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java index 9214d4679921..36dd415b4fa9 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerDatabaseServlet.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java index d7ccf462e3ac..daeb0ce41838 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServlet.java @@ -19,12 +19,12 @@ import org.keycloak.KeycloakSecurityContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.HttpHeaders; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServletNoConf.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServletNoConf.java index 0710814d01c1..d72842377d73 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServletNoConf.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/CustomerServletNoConf.java @@ -19,12 +19,12 @@ import org.keycloak.KeycloakSecurityContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.HttpHeaders; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java index f718b5f4f387..727087fbb410 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import org.keycloak.adapters.spi.AuthenticationError; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java index f945729bcc46..4cc5f08a19cb 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java @@ -19,11 +19,11 @@ import org.junit.Assert; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/KerberosCredDelegServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/KerberosCredDelegServlet.java index 5c93c6e464c1..874d429a15d3 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/KerberosCredDelegServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/KerberosCredDelegServlet.java @@ -28,10 +28,10 @@ import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; import javax.security.sasl.Sasl; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Hashtable; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/LinkAndExchangeServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/LinkAndExchangeServlet.java index 00a17e64cb8c..9706a2f6359c 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/LinkAndExchangeServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/LinkAndExchangeServlet.java @@ -32,12 +32,12 @@ import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.JsonSerialization; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.HttpHeaders; import java.io.IOException; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantServlet.java index d658db757452..6a0b1b8dbf2c 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantServlet.java @@ -18,10 +18,10 @@ import org.keycloak.KeycloakSecurityContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/OfflineTokenServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/OfflineTokenServlet.java index 242543044561..144462633f72 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/OfflineTokenServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/OfflineTokenServlet.java @@ -2,10 +2,10 @@ import org.keycloak.OAuth2Constants; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.UriBuilder; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; /** diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ProductServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ProductServlet.java index ce07a5dc6fcb..3231315257dc 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ProductServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ProductServlet.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java index c2ae10e6e975..734785190d35 100755 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java @@ -24,11 +24,11 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.UriBuilder; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.io.PrintWriter; import java.net.URI; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java index b533cd1a825e..652938d2d8ce 100755 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java @@ -25,18 +25,18 @@ import org.keycloak.adapters.spi.AuthenticationError; import org.keycloak.saml.processing.core.saml.v2.constants.X500SAMLProfileConstants; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import javax.xml.datatype.XMLGregorianCalendar; import java.io.IOException; import java.io.StringWriter; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SerializationServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SerializationServlet.java index eef704f86f8e..ffed4fa9f46b 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SerializationServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SerializationServlet.java @@ -21,10 +21,10 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SessionServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SessionServlet.java index e8320a55aacc..dbf7e3deae00 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SessionServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SessionServlet.java @@ -17,12 +17,12 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.io.PrintWriter; import java.io.Serializable; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/TokenMinTTLServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/TokenMinTTLServlet.java index 7d266bc8875d..e242d32408e1 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/TokenMinTTLServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/TokenMinTTLServlet.java @@ -17,9 +17,9 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/src/main/java/org/keycloak/AdminController.java b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/src/main/java/org/keycloak/AdminController.java index e4333d375e0b..cbe5f22df01e 100644 --- a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/src/main/java/org/keycloak/AdminController.java +++ b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/src/main/java/org/keycloak/AdminController.java @@ -22,8 +22,8 @@ import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.WebRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/helpers/DropAllServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/helpers/DropAllServlet.java index 82fe5025d0da..33b1a587647a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/helpers/DropAllServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/helpers/DropAllServlet.java @@ -17,16 +17,16 @@ */ package org.keycloak.helpers; +import jakarta.annotation.Resource; import liquibase.Liquibase; import liquibase.database.Database; import liquibase.database.DatabaseFactory; import liquibase.database.jvm.JdbcConnection; import org.jboss.logging.Logger; -import javax.annotation.Resource; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; import javax.sql.DataSource; import java.sql.Connection; import java.sql.Statement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/ActionURIUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/ActionURIUtils.java index 28027e771ca9..67cb082d50e3 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/ActionURIUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/ActionURIUtils.java @@ -23,7 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * Helper for parse action-uri from the HTML login page and do something with it (eg. open in new browser, parse code parameter and use it somewhere else etc) diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BasicAuth.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BasicAuth.java index aaddcf0811b5..51ada694fa25 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BasicAuth.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BasicAuth.java @@ -21,7 +21,7 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URL; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/CustomerPortal.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/CustomerPortal.java index 2229e8649f91..920bf4862d55 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/CustomerPortal.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/CustomerPortal.java @@ -21,7 +21,7 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; import java.net.URL; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant.java index 7d3d5d03d306..1c953ff3fb4a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant.java @@ -21,7 +21,7 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.MalformedURLException; import java.net.URL; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServlet.java index 54c480711230..ce8d47497ca6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServlet.java @@ -24,7 +24,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; import org.keycloak.testsuite.util.WaitUtils; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SerializationServletPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SerializationServletPage.java index 2308cb981824..8a46979aa804 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SerializationServletPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SerializationServletPage.java @@ -21,7 +21,7 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; import java.net.URL; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java index 5d31082280df..7ac4d3e9631f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java @@ -31,10 +31,10 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.StatusType; import java.net.URI; import java.util.ArrayList; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java index 23f0468393e8..7d07e7c64f0d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java @@ -72,7 +72,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthRealm.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthRealm.java index 83b449e669f7..b29949623843 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthRealm.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthRealm.java @@ -20,7 +20,7 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.testsuite.auth.page.login.PageWithLoginUrl; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServer.java index b16a8340f299..1affc376c591 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServer.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServer.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.auth.page; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/AccountManagement.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/AccountManagement.java index 17fdb09bbac8..618fdadba678 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/AccountManagement.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/AccountManagement.java @@ -22,7 +22,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Applications.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Applications.java index b5d96f6a835e..21fc8bc25830 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Applications.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Applications.java @@ -20,7 +20,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.util.List; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Autheticator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Autheticator.java index 574888434eb5..ede0943efeec 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Autheticator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Autheticator.java @@ -16,7 +16,7 @@ */ package org.keycloak.testsuite.auth.page.account; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/ChangePassword.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/ChangePassword.java index 790b8b032f33..d3fd842fc774 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/ChangePassword.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/ChangePassword.java @@ -19,7 +19,7 @@ import org.jboss.arquillian.graphene.page.Page; import org.keycloak.testsuite.auth.page.PasswordFields; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Sessions.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Sessions.java index 2bd8177b7a46..a2c40064ebd1 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Sessions.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/Sessions.java @@ -20,7 +20,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.util.LinkedList; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Authenticate.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Authenticate.java index 9e0efda313da..333ccfbc38e7 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Authenticate.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Authenticate.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.auth.page.login; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Login.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Login.java index b8ac9c425042..ccd200691154 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Login.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Login.java @@ -18,7 +18,7 @@ import org.jboss.arquillian.graphene.page.Page; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginActions.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginActions.java index f30a35a5b215..e1087bb129eb 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginActions.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginActions.java @@ -20,7 +20,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import static org.keycloak.testsuite.util.UIUtils.clickLink; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Registration.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Registration.java index b53aa6250050..eef7539bfdb4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Registration.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Registration.java @@ -23,7 +23,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import static org.keycloak.testsuite.admin.Users.getPasswordOf; import static org.keycloak.testsuite.util.UIUtils.clickLink; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/RequiredActions.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/RequiredActions.java index 34e45f97ba41..31e97f52f779 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/RequiredActions.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/RequiredActions.java @@ -19,7 +19,7 @@ import org.keycloak.testsuite.util.URLUtils; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * @author Vaclav Muzikar diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/ResetCredentials.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/ResetCredentials.java index a542145bfa50..dcc0d514974d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/ResetCredentials.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/ResetCredentials.java @@ -19,7 +19,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import static org.keycloak.testsuite.util.UIUtils.clickLink; import static org.keycloak.testsuite.util.UIUtils.setTextInputValue; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/SAMLIDPInitiatedLogin.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/SAMLIDPInitiatedLogin.java index 66cf0758c06b..648c3b949814 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/SAMLIDPInitiatedLogin.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/SAMLIDPInitiatedLogin.java @@ -1,6 +1,6 @@ package org.keycloak.testsuite.auth.page.login; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * @author mhajas diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/KeycloakTestingClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/KeycloakTestingClient.java index cb9194839ef0..eb0fc218383f 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/KeycloakTestingClient.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/KeycloakTestingClient.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.client; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResource.java index 90450d0f877d..c0d4d3a59484 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResource.java @@ -23,11 +23,11 @@ import org.keycloak.representations.adapters.action.TestAvailabilityAction; import org.keycloak.utils.MediaType; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResourceUrls.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResourceUrls.java index 66011f85f05d..71aea7c4dc7f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResourceUrls.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResourceUrls.java @@ -19,7 +19,7 @@ import org.keycloak.testsuite.util.OAuthClient; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestExampleCompanyResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestExampleCompanyResource.java index bc87572ff7c9..c065a30e6111 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestExampleCompanyResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestExampleCompanyResource.java @@ -19,15 +19,15 @@ import org.keycloak.testsuite.domainextension.CompanyRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java index 003f409e9ca1..8a621de2157a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java @@ -23,15 +23,15 @@ import org.keycloak.services.clientpolicy.executor.IntentClientBindCheckExecutor; import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestSamlApplicationResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestSamlApplicationResource.java index e0bf6d717cdc..b0d1975763c1 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestSamlApplicationResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestSamlApplicationResource.java @@ -22,11 +22,11 @@ import org.keycloak.representations.adapters.action.TestAvailabilityAction; import org.keycloak.utils.MediaType; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingCacheResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingCacheResource.java index b41149d9e240..0173e498f74f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingCacheResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingCacheResource.java @@ -20,12 +20,12 @@ import org.keycloak.testsuite.rest.representation.RemoteCacheStats; import org.keycloak.utils.MediaType; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import java.util.Set; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingExportImportResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingExportImportResource.java index 69a2be718fc4..a7583652d547 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingExportImportResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingExportImportResource.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite.client.resources; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.exportimport.Strategy; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingLDAPResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingLDAPResource.java index c71de94aa5bb..27f0bed96dd6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingLDAPResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingLDAPResource.java @@ -19,12 +19,12 @@ import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import org.keycloak.utils.MediaType; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java index 3788db5b9373..22acc91ac1b9 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java @@ -27,15 +27,15 @@ import org.keycloak.testsuite.rest.representation.AuthenticatorState; import org.keycloak.utils.MediaType; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsole.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsole.java index af083ed2330f..a026fabd6be6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsole.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsole.java @@ -26,7 +26,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleCreate.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleCreate.java index 06b591da6f82..f81dc08d2942 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleCreate.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleCreate.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.console.page; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; import static org.keycloak.testsuite.console.page.AdminConsoleRealm.CONSOLE_REALM; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleRealmsRoot.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleRealmsRoot.java index f1054e56e115..4f339971f836 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleRealmsRoot.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleRealmsRoot.java @@ -21,7 +21,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.util.List; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/ForbiddenPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/ForbiddenPage.java index df933db67184..ad73a65d51ca 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/ForbiddenPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/ForbiddenPage.java @@ -16,7 +16,7 @@ */ package org.keycloak.testsuite.console.page; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; public class ForbiddenPage extends AdminConsole { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPage.java index 9cdb90ddf6e2..544fe46ac923 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPage.java @@ -24,7 +24,7 @@ import org.keycloak.testsuite.util.URLUtils; import org.openqa.selenium.WebDriver; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; import java.util.HashMap; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPageWithInjectedUrl.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPageWithInjectedUrl.java index 0007c072c3fd..7b38360f22aa 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPageWithInjectedUrl.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPageWithInjectedUrl.java @@ -19,7 +19,7 @@ import org.keycloak.testsuite.util.ServerURLs; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java index ec08940ed3c9..66e87693fa4c 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountUpdateProfilePage.java @@ -26,7 +26,7 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java index 749cff4bfb95..49e0bda72475 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java @@ -22,7 +22,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import static org.keycloak.testsuite.util.UIUtils.clickLink; import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/servlet/ApplicationServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/servlet/ApplicationServlet.java index eaaa920ae33e..5f074abeba27 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/servlet/ApplicationServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/servlet/ApplicationServlet.java @@ -18,11 +18,11 @@ import org.keycloak.services.resources.RealmsResource; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.UriBuilder; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.io.PrintWriter; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/Creator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/Creator.java index 5995992bec4e..7acccf7fd643 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/Creator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/Creator.java @@ -41,7 +41,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matchers; import org.jboss.logging.Logger; import org.junit.Assert; @@ -146,7 +146,7 @@ public void close() { LOG.debugf("Removing resource ID %s", id); try { closer.run(); - } catch (javax.ws.rs.NotFoundException ex) { + } catch (jakarta.ws.rs.NotFoundException ex) { LOG.debugf("Resource with ID %s perhaps removed in meantime.", id); } } else { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderCreator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderCreator.java index de3da0668a90..ae813108aa5a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderCreator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderCreator.java @@ -19,11 +19,11 @@ import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.IdentityProvidersResource; import java.io.Closeable; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.IdentityProviderRepresentation; import java.io.IOException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * Creates a temporary realm and makes sure it is removed. diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ArtifactResolutionService.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ArtifactResolutionService.java index 75b9f7a31aa3..8b167533ba2d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ArtifactResolutionService.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ArtifactResolutionService.java @@ -18,12 +18,12 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import javax.xml.ws.Endpoint; -import javax.xml.ws.Provider; -import javax.xml.ws.Service; -import javax.xml.ws.ServiceMode; -import javax.xml.ws.WebServiceProvider; -import javax.xml.ws.http.HTTPBinding; +import jakarta.xml.ws.Endpoint; +import jakarta.xml.ws.Provider; +import jakarta.xml.ws.Service; +import jakarta.xml.ws.ServiceMode; +import jakarta.xml.ws.WebServiceProvider; +import jakarta.xml.ws.http.HTTPBinding; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java index efc82f3efaa8..64418a113918 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java @@ -22,7 +22,7 @@ import org.junit.rules.ExternalResource; import org.keycloak.models.RealmModel; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.lang.Thread.UncaughtExceptionHandler; import java.net.SocketException; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java index 22ff33a4cf68..c4f3be705826 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.util; -import javax.mail.Address; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Matchers.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Matchers.java index e0e8b38781fe..09d430d3125c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Matchers.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Matchers.java @@ -28,7 +28,7 @@ import java.net.URI; import java.util.Arrays; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpResponse; import org.hamcrest.Matcher; import static org.hamcrest.Matchers.*; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java index 2e5bc9f9eed9..25c3a499c66e 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java @@ -5,9 +5,9 @@ import org.subethamail.smtp.MessageHandlerFactory; import org.subethamail.smtp.RejectException; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MutualTLSUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MutualTLSUtils.java index a90ee089d984..9d97bb65f0a7 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MutualTLSUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MutualTLSUtils.java @@ -7,11 +7,11 @@ import java.security.cert.X509Certificate; import java.util.Enumeration; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java index 81fe8a0d1b71..dcf606ecfd42 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/OAuthClient.java @@ -79,9 +79,9 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java index c237a2735bb7..8556d6ecb355 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java @@ -65,17 +65,17 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPHeader; -import javax.xml.soap.SOAPHeaderElement; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.soap.SOAPFaultException; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPBody; +import jakarta.xml.soap.SOAPEnvelope; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.soap.SOAPHeaderElement; +import jakarta.xml.soap.SOAPMessage; +import jakarta.xml.ws.soap.SOAPFaultException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClientBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClientBuilder.java index 44a55e65f914..ad16a682ee33 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClientBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClientBuilder.java @@ -40,7 +40,7 @@ import org.keycloak.testsuite.util.saml.ModifySamlResponseStepBuilder; import org.keycloak.testsuite.util.saml.RequiredConsentBuilder; import java.util.function.Function; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.http.client.methods.HttpUriRequest; import org.hamcrest.Matcher; import org.junit.Assert; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TestCleanup.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TestCleanup.java index 7568a4f4d2a0..bdabcda0696b 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TestCleanup.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TestCleanup.java @@ -19,7 +19,7 @@ import java.util.List; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenSignatureUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenSignatureUtil.java index 5c5fb3cd176d..caddd2e0da57 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenSignatureUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenSignatureUtil.java @@ -24,7 +24,7 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.X509EncodedKeySpec; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.logging.Logger; import org.keycloak.admin.client.Keycloak; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UserInfoClientUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UserInfoClientUtil.java index c540a04c931b..c8a676712c99 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UserInfoClientUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UserInfoClientUtil.java @@ -22,12 +22,12 @@ import org.keycloak.representations.UserInfo; import org.keycloak.utils.MediaType; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseBodyMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseBodyMatcher.java index ae436ce29f98..9bb0ef3ae7ff 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseBodyMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseBodyMatcher.java @@ -16,7 +16,7 @@ */ package org.keycloak.testsuite.util.matchers; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseStatusCodeMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseStatusCodeMatcher.java index d7b7230451b1..78f5e0eb81eb 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseStatusCodeMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseStatusCodeMatcher.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.util.matchers; import java.io.IOException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; import org.hamcrest.BaseMatcher; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseBodyMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseBodyMatcher.java index 4a9788fa939b..cfce56387718 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseBodyMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseBodyMatcher.java @@ -16,7 +16,7 @@ */ package org.keycloak.testsuite.util.matchers; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseHeaderMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseHeaderMatcher.java index e2a3bb5b7153..7e1c41371c10 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseHeaderMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseHeaderMatcher.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.util.matchers; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseStatusCodeMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseStatusCodeMatcher.java index a4e1885b986b..5170bd2d8365 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseStatusCodeMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseStatusCodeMatcher.java @@ -16,7 +16,7 @@ */ package org.keycloak.testsuite.util.matchers; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateAuthnRequestStepBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateAuthnRequestStepBuilder.java index c48815b9fee9..d615e03531e6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateAuthnRequestStepBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateAuthnRequestStepBuilder.java @@ -37,7 +37,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.w3c.dom.Document; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; public class CreateAuthnRequestStepBuilder extends SamlDocumentStepBuilder { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/HandleArtifactStepBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/HandleArtifactStepBuilder.java index 26d12d0460ac..e2a534444f1d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/HandleArtifactStepBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/HandleArtifactStepBuilder.java @@ -26,7 +26,7 @@ import org.keycloak.testsuite.util.SamlClientBuilder; import org.w3c.dom.Document; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import javax.xml.stream.XMLStreamWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/LoginBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/LoginBuilder.java index 4701c46d489b..c6b0329d22fb 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/LoginBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/LoginBuilder.java @@ -25,8 +25,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Objects; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/ModifySamlResponseStepBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/ModifySamlResponseStepBuilder.java index 4dcb261756dd..ddbcef274b55 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/ModifySamlResponseStepBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/ModifySamlResponseStepBuilder.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Objects; import java.util.function.Supplier; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.io.IOUtils; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/RequiredConsentBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/RequiredConsentBuilder.java index 242441c96ca4..8b20df223156 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/RequiredConsentBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/RequiredConsentBuilder.java @@ -23,8 +23,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Objects; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/UpdateProfileBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/UpdateProfileBuilder.java index e928c9c9f70e..694b8b9ef921 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/UpdateProfileBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/UpdateProfileBuilder.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java index eb870796640d..26b0257898e6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java @@ -67,8 +67,8 @@ import org.keycloak.testsuite.util.TestEventsLogger; import org.openqa.selenium.WebDriver; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.io.InputStream; import java.io.PipedInputStream; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java index 5aeeefe822e9..f05890e36db3 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java @@ -42,7 +42,7 @@ import org.keycloak.testsuite.util.TokenUtil; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java index 3fe050e169bc..440cba6f4714 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java @@ -20,7 +20,7 @@ import java.io.IOException; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import org.jboss.logging.Logger; import org.junit.Assert; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java index 0fe479980e9f..f9f68bf4868d 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java @@ -68,8 +68,8 @@ import org.keycloak.userprofile.UserProfileContext; import org.keycloak.validate.validators.EmailValidator; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Collections; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ResourcesRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ResourcesRestServiceTest.java index f8f33453ffd8..0c7401b8986e 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ResourcesRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ResourcesRestServiceTest.java @@ -46,7 +46,7 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowCookieTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowCookieTest.java index db4cc0a4f65d..c513c9b3673b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowCookieTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowCookieTest.java @@ -24,7 +24,7 @@ import java.util.Arrays; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.util.OAuthClient.APP_ROOT; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java index 67c3f3a3f065..a72770c4f33c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java @@ -35,8 +35,8 @@ import org.keycloak.testsuite.pages.PageUtils; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java index 2746cb1745d8..dfda289d8adc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.account.custom; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.arquillian.graphene.page.Page; import org.junit.Assert; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionTest.java index fb577ceb3dbb..b79a0699d134 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionTest.java @@ -28,7 +28,7 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.WaitUtils; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java index 3660cc057175..01b4e126667f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java @@ -20,10 +20,10 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.jboss.arquillian.graphene.page.Page; import org.junit.Assert; import org.junit.Rule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java index f7d2ec3d6a92..55f88f55b6cf 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java @@ -61,8 +61,8 @@ import org.keycloak.testsuite.util.MailUtils; import java.io.Closeable; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.net.URISyntaxException; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java index 49271c624804..a4dd2135399e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java @@ -21,10 +21,10 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.jboss.arquillian.graphene.page.Page; import org.junit.Rule; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java index 385c5df3d4cf..061a4a78be36 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java @@ -27,7 +27,7 @@ import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils; import org.keycloak.testsuite.utils.io.IOUtil; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URL; import java.nio.charset.Charset; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletAdapterTest.java index 5230a7dbe7f7..b65e6ff1d742 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletAdapterTest.java @@ -17,8 +17,8 @@ import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.utils.io.IOUtil; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java index 11dbd0a60e1d..b630a66b9981 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/BrokerLinkAndTokenExchangeTest.java @@ -70,13 +70,13 @@ import org.keycloak.testsuite.utils.arquillian.ContainerConstants; import org.keycloak.util.BasicAuthHelper; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.io.File; import java.net.URL; import java.util.LinkedList; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java index 26c794eb0091..f3f6cd2518af 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/ClientInitiatedAccountLinkTest.java @@ -57,8 +57,8 @@ import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.UriBuilder; import java.net.URL; import java.util.LinkedList; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java index 98baf0f13c15..fc8ee9f5168a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/DemoServletsAdapterTest.java @@ -97,14 +97,14 @@ import org.openqa.selenium.Cookie; import org.openqa.selenium.WebDriver; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; import java.io.File; import java.io.IOException; import java.net.URI; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/MultiTenancyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/MultiTenancyTest.java index b8bd952dc2ff..bdd2ad217585 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/MultiTenancyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/MultiTenancyTest.java @@ -18,7 +18,7 @@ import java.net.URL; import java.util.List; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.graphene.page.Page; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java index 5a69a8a6a761..25c82174df2c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OIDCPublicKeyRotationAdapterTest.java @@ -22,8 +22,8 @@ import java.nio.charset.Charset; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java index 338f717cdcd2..e7ae7f477c89 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/OfflineServletsAdapterTest.java @@ -1,6 +1,6 @@ package org.keycloak.testsuite.adapter.servlet; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.util.List; import java.util.Map; import java.util.LinkedHashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java index 784ab8709e8c..7fa932d55f3f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java @@ -32,7 +32,7 @@ import org.openqa.selenium.By; import org.w3c.dom.Document; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java index b4fd833ca72f..d3ba18cc00c8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.http.HttpResponse; import org.apache.http.client.methods.CloseableHttpResponse; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java index 4663faf543c1..d3631e13cfb1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.adapter.servlet; -import static javax.ws.rs.core.Response.Status.OK; +import static jakarta.ws.rs.core.Response.Status.OK; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; import static org.keycloak.OAuth2Constants.PASSWORD; @@ -57,22 +57,22 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; import javax.xml.XMLConstants; import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPHeader; -import javax.xml.soap.SOAPHeaderElement; -import javax.xml.soap.SOAPMessage; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.soap.SOAPHeaderElement; +import jakarta.xml.soap.SOAPMessage; import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -1624,7 +1624,7 @@ public void testSuccessfulEcpFlow() throws Exception { //printDocument(authnRequestMessage.getSOAPPart().getContent(), System.out); - Iterator it = authnRequestMessage.getSOAPHeader().getChildElements(new QName("urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", "Request")); + Iterator it = authnRequestMessage.getSOAPHeader().getChildElements(new QName("urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", "Request")); SOAPHeaderElement ecpRequestHeader = (SOAPHeaderElement)it.next(); NodeList idpList = ecpRequestHeader.getElementsByTagNameNS("urn:oasis:names:tc:SAML:2.0:protocol", "IDPList"); @@ -1711,12 +1711,12 @@ public void testInvalidCredentialsEcpFlow() throws Exception { .get(); SOAPMessage authnRequestMessage = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(authnRequestResponse.readEntity(byte[].class))); - Iterator it = authnRequestMessage.getSOAPHeader().getChildElements(new QName("urn:liberty:paos:2003-08", "Request")); + Iterator it = authnRequestMessage.getSOAPHeader().getChildElements(new QName("urn:liberty:paos:2003-08", "Request")); it.next(); it = authnRequestMessage.getSOAPHeader().getChildElements(new QName("urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", "Request")); - javax.xml.soap.Node ecpRequestHeader = it.next(); + jakarta.xml.soap.Node ecpRequestHeader = it.next(); NodeList idpList = ((SOAPHeaderElement)ecpRequestHeader).getElementsByTagNameNS("urn:oasis:names:tc:SAML:2.0:protocol", "IDPList"); Assert.assertThat("No IDPList returned from Service Provider", idpList.getLength(), is(1)); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java index c54a779cd46c..8ebe4d7dc231 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java @@ -44,7 +44,7 @@ import java.util.UUID; import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import javax.xml.crypto.dsig.XMLSignature; import org.apache.http.client.methods.CloseableHttpResponse; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java index b2d804d4e994..4c783d2e943e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/UserStorageConsentTest.java @@ -48,7 +48,7 @@ import org.keycloak.testsuite.pages.LogoutConfirmPage; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminClientTest.java index 7141cef9ad51..e97292be3c3b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminClientTest.java @@ -19,8 +19,8 @@ package org.keycloak.testsuite.admin; import java.util.List; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.core.Response; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminHeadersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminHeadersTest.java index 41fcdfd212b8..648be3236abd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminHeadersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminHeadersTest.java @@ -8,8 +8,8 @@ import org.keycloak.models.BrowserSecurityHeaders; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java index 9e5f1258cdc8..d01281190cd4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ClientTest.java @@ -80,9 +80,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ComponentsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ComponentsTest.java index 351aed8add78..23d66ec5ef58 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ComponentsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ComponentsTest.java @@ -27,8 +27,8 @@ import org.keycloak.representations.idm.*; import org.keycloak.testsuite.components.TestProvider; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/CrossRealmPermissionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/CrossRealmPermissionsTest.java index e32a8ad67792..78fe8eb07821 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/CrossRealmPermissionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/CrossRealmPermissionsTest.java @@ -32,8 +32,8 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.utils.tls.TLSUtils; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.concurrent.atomic.AtomicReference; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/DeclarativeUserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/DeclarativeUserTest.java index 4a88d04e8c1b..28abcff3072a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/DeclarativeUserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/DeclarativeUserTest.java @@ -42,9 +42,9 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; /** * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java index d025fcbbf2dc..05a14a92dc49 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/FineGrainAdminUnitTest.java @@ -60,9 +60,9 @@ import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.utils.tls.TLSUtils; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java index a045096b61eb..a16a6a2ec877 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java @@ -59,10 +59,10 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import javax.xml.crypto.dsig.XMLSignature; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java index 3bdb299fc92c..45572a63f39c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/IllegalAdminUpgradeTest.java @@ -35,8 +35,8 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.util.AdminClientUtil; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; import java.util.LinkedList; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationDisabledTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationDisabledTest.java index b1485c5b1009..a7cd9c0f03fe 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationDisabledTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationDisabledTest.java @@ -20,8 +20,8 @@ import org.junit.BeforeClass; import org.junit.Test; -import javax.ws.rs.ServerErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ServerErrorException; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java index 0f86660cf6a6..2932aff8a6be 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ImpersonationTest.java @@ -60,9 +60,9 @@ import org.keycloak.testsuite.util.*; import org.openqa.selenium.Cookie; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URL; import java.util.*; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ManagementPermissionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ManagementPermissionsTest.java index b5e3d1a0adfc..431a50f1c3c9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ManagementPermissionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/ManagementPermissionsTest.java @@ -26,7 +26,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java index 6852684e2c22..b0f758ccb526 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/PermissionsTest.java @@ -68,8 +68,8 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/RealmLocalizationResourceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/RealmLocalizationResourceTest.java index 67a2afc58cee..1b4ac25b2fbf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/RealmLocalizationResourceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/RealmLocalizationResourceTest.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; public class RealmLocalizationResourceTest extends AbstractAdminTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/RoleByIdResourceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/RoleByIdResourceTest.java index 94ea525b2258..3e5072f91045 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/RoleByIdResourceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/RoleByIdResourceTest.java @@ -29,9 +29,9 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RoleBuilder; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java index 712529821c09..814159ffb711 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/SMTPConnectionTest.java @@ -27,8 +27,8 @@ import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.UserBuilder; -import javax.mail.internet.MimeMessage; -import javax.ws.rs.core.Response; +import jakarta.mail.internet.MimeMessage; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserFederationLdapConnectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserFederationLdapConnectionTest.java index 9dbad2e3b229..06fcf864d91d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserFederationLdapConnectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserFederationLdapConnectionTest.java @@ -31,8 +31,8 @@ import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.util.LDAPRule; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserStorageRestTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserStorageRestTest.java index 856a9a883082..99db8ded6404 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserStorageRestTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserStorageRestTest.java @@ -40,8 +40,8 @@ import org.keycloak.testsuite.admin.authentication.AbstractAuthenticationTest; import org.keycloak.testsuite.util.AdminEventPaths; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; import java.util.List; import static org.keycloak.testsuite.util.KerberosUtils.assumeKerberosSupportExpected; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java index fcdb24799ab3..cc89dfaf4838 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/UserTest.java @@ -88,12 +88,12 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; -import javax.mail.internet.MimeMessage; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.mail.internet.MimeMessage; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java index 0bc13998995b..f587ffa97ea7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AbstractAuthenticationTest.java @@ -35,7 +35,7 @@ import org.keycloak.testsuite.util.AssertAdminEvents; import org.keycloak.testsuite.util.RealmBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AuthenticatorConfigTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AuthenticatorConfigTest.java index 25960693ca88..97a62d289e06 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AuthenticatorConfigTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/AuthenticatorConfigTest.java @@ -30,12 +30,12 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.AdminEventPaths; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java index e973fd739712..8d094b480a20 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ExecutionTest.java @@ -34,9 +34,9 @@ import org.keycloak.testsuite.util.AdminEventPaths; import org.keycloak.testsuite.util.AssertAdminEvents; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java index 59db3feb8826..e524b6ea7a00 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/FlowTest.java @@ -31,12 +31,12 @@ import org.keycloak.testsuite.util.AdminEventPaths; import org.keycloak.testsuite.util.ContainerAssume; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.InternalServerErrorException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java index 5dbea7f90d9c..e11505bdd184 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ProvidersTest.java @@ -26,7 +26,7 @@ import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.util.KerberosUtils; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RegistrationFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RegistrationFlowTest.java index 5f29bded3d29..de60cb0a1ac7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RegistrationFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RegistrationFlowTest.java @@ -24,7 +24,7 @@ import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.testsuite.util.AdminEventPaths; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import java.util.HashMap; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RequiredActionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RequiredActionsTest.java index f1f304a8b14d..b5fd9e245163 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RequiredActionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/RequiredActionsTest.java @@ -26,8 +26,8 @@ import org.keycloak.testsuite.actions.DummyRequiredActionFactory; import org.keycloak.testsuite.util.AdminEventPaths; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.NotFoundException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftExecutionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftExecutionTest.java index cecda62daef0..2f394542adeb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftExecutionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftExecutionTest.java @@ -24,9 +24,9 @@ import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation; import org.keycloak.testsuite.util.AdminEventPaths; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftRequiredActionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftRequiredActionTest.java index c589a4107770..b9c1fb8daed4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftRequiredActionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/authentication/ShiftRequiredActionTest.java @@ -19,7 +19,7 @@ import java.util.List; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractClientTest.java index 608292b5010f..a46df0e58adf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/AbstractClientTest.java @@ -34,7 +34,7 @@ import org.keycloak.testsuite.util.AssertAdminEvents; import org.keycloak.testsuite.util.RealmBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientProtocolMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientProtocolMapperTest.java index 265c80679b5b..f9e2bc80abac 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientProtocolMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientProtocolMapperTest.java @@ -31,8 +31,8 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.AdminEventPaths; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientRolesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientRolesTest.java index c4b0d644889d..07f60ac0d3d6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientRolesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientRolesTest.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.ws.rs.ClientErrorException; +import jakarta.ws.rs.ClientErrorException; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeProtocolMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeProtocolMapperTest.java index 92ee2e0f5333..9b84cd7f6bb8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeProtocolMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeProtocolMapperTest.java @@ -34,8 +34,8 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.AdminEventPaths; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeTest.java index 083e749890cb..cb44196b63a7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/ClientScopeTest.java @@ -48,10 +48,10 @@ import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.io.IOException; import java.util.Collections; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/CredentialsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/CredentialsTest.java index 1189d1da00ca..24ce7100852a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/CredentialsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/CredentialsTest.java @@ -36,7 +36,7 @@ import org.keycloak.testsuite.util.AdminEventPaths; import org.keycloak.testsuite.util.KeystoreUtils; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.nio.charset.Charset; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/InstallationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/InstallationTest.java index b22f044ad344..92fe730a4759 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/InstallationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/client/InstallationTest.java @@ -44,7 +44,7 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import static org.junit.Assert.assertThat; import static org.hamcrest.Matchers.*; import static org.keycloak.common.Profile.Feature.AUTHORIZATION; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/concurrency/ConcurrencyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/concurrency/ConcurrencyTest.java index 301f515b6e34..a26687b541c8 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/concurrency/ConcurrencyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/concurrency/ConcurrencyTest.java @@ -29,8 +29,8 @@ import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.RoleRepresentation; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.admin.ApiUtil; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/concurrency/ConcurrentLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/concurrency/ConcurrentLoginTest.java index c9e9086bbbb9..be9094cac395 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/concurrency/ConcurrentLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/concurrency/ConcurrentLoginTest.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/AbstractGroupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/AbstractGroupTest.java index 00e508956ee0..27b5e152cbfe 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/AbstractGroupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/AbstractGroupTest.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.admin.group; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.Rule; import org.keycloak.OAuth2Constants; import org.keycloak.RSATokenVerifier; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java index e424a6cf5063..70cc2bdaa08e 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupTest.java @@ -50,8 +50,8 @@ import org.keycloak.testsuite.utils.tls.TLSUtils; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URI; import java.util.ArrayList; @@ -65,8 +65,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response.Status; import static org.hamcrest.Matchers.*; import org.junit.Rule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialimport/PartialImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialimport/PartialImportTest.java index f20486865772..468647e1af40 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialimport/PartialImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/partialimport/PartialImportTest.java @@ -48,7 +48,7 @@ import org.keycloak.testsuite.util.AssertAdminEvents; import org.keycloak.testsuite.util.RealmBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmRolesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmRolesTest.java index 4d5e554cf886..de1fb02557cb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmRolesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmRolesTest.java @@ -35,8 +35,8 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RoleBuilder; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.Collection; @@ -47,8 +47,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.ClientErrorException; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.ClientErrorException; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java index 5740a98ed9d5..45bfa35437be 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/realm/RealmTest.java @@ -72,9 +72,9 @@ import org.keycloak.testsuite.utils.tls.TLSUtils; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractResourceServerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractResourceServerTest.java index e5d670fa996e..c2a53ee06893 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractResourceServerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractResourceServerTest.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java index d4ac84b4c245..b1ad3c1e03ef 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java index 285459764196..cd45e852cc15 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jetbrains.annotations.NotNull; import org.junit.After; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java index 49b194ead3b0..126122fdeffb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java @@ -26,7 +26,7 @@ import static org.junit.Assert.fail; import static org.keycloak.testsuite.AssertEvents.isUUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java index c7a13664558f..8285a1fddd16 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java index 2870a270c1ef..9a0fcb2e8a27 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java @@ -22,10 +22,10 @@ import java.util.HashMap; import java.util.List; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.arquillian.test.api.ArquillianResource; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java index 7b59e39c4e85..1087c210c7ab 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java @@ -34,12 +34,12 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriBuilder; import com.google.common.base.Charsets; import org.apache.http.NameValuePair; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java index de887182b926..5b6e3125bcc1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.UUID; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.junit.Test; import org.keycloak.admin.client.resource.UsersResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBasePhotozExampleAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBasePhotozExampleAdapterTest.java index 6da53179cb83..0a1c75b27ace 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBasePhotozExampleAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBasePhotozExampleAdapterTest.java @@ -25,7 +25,7 @@ import static org.keycloak.testsuite.utils.io.IOUtil.loadJson; import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBaseServletAuthzAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBaseServletAuthzAdapterTest.java index 83813bfb86df..b6094c5f7004 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBaseServletAuthzAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBaseServletAuthzAdapterTest.java @@ -38,7 +38,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletAuthzAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletAuthzAdapterTest.java index c3076a2c9c17..913986b4b737 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletAuthzAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletAuthzAdapterTest.java @@ -34,7 +34,7 @@ import org.keycloak.testsuite.util.WaitUtils; import org.openqa.selenium.By; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/LifespanAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/LifespanAdapterTest.java index 46264a0cdaa6..5a36eae334d8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/LifespanAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/LifespanAdapterTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.File; import java.io.IOException; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCIPAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCIPAdapterTest.java index 6be3dbb65abf..7d9530286f3c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCIPAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCIPAdapterTest.java @@ -16,11 +16,11 @@ */ package org.keycloak.testsuite.authz.adapter.example; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.File; import java.io.IOException; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractAuthorizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractAuthorizationTest.java index cb8a8702a4e1..391556a597b6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractAuthorizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractAuthorizationTest.java @@ -33,7 +33,7 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertEquals; import static org.keycloak.common.Profile.Feature.AUTHORIZATION; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractPolicyManagementTest.java index aab34e750bc1..847951aca264 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractPolicyManagementTest.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.function.Supplier; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.BeforeClass; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java index 2d1cca467121..d94e66097307 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java @@ -20,8 +20,8 @@ import java.util.Collections; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.junit.Test; import org.keycloak.admin.client.resource.AggregatePoliciesResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationDisabledInPreviewTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationDisabledInPreviewTest.java index 9c39bf30ef7b..234a5683d060 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationDisabledInPreviewTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationDisabledInPreviewTest.java @@ -24,8 +24,8 @@ import org.keycloak.testsuite.admin.client.AbstractClientTest; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; -import javax.ws.rs.ServerErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ServerErrorException; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ClientPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ClientPolicyManagementTest.java index 5b8d6eba1719..18e4e1043adc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ClientPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ClientPolicyManagementTest.java @@ -24,8 +24,8 @@ import java.util.Collections; import java.util.stream.Collectors; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ExportAuthorizationSettingsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ExportAuthorizationSettingsTest.java index 10287b59a3df..5127b6c6d567 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ExportAuthorizationSettingsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ExportAuthorizationSettingsTest.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GenericPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GenericPolicyManagementTest.java index 7d86a2f8bb08..747e1625a22d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GenericPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GenericPolicyManagementTest.java @@ -33,7 +33,7 @@ import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GroupPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GroupPolicyManagementTest.java index f51871968380..08e7302ebe57 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GroupPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GroupPolicyManagementTest.java @@ -27,8 +27,8 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/JSPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/JSPolicyManagementTest.java index 984b921d8087..094a4b01f387 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/JSPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/JSPolicyManagementTest.java @@ -21,8 +21,8 @@ import java.util.Collections; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/PolicyEnforcerClaimsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/PolicyEnforcerClaimsTest.java index c5d7c6182f40..a9a01515239c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/PolicyEnforcerClaimsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/PolicyEnforcerClaimsTest.java @@ -384,7 +384,7 @@ private ResourceRepresentation createResource(ClientResource clientResource, Str representation.setUri(uri); representation.setScopes(Arrays.asList(scopes).stream().map(ScopeRepresentation::new).collect(Collectors.toSet())); - try (javax.ws.rs.core.Response response = clientResource.authorization().resources().create(representation)) { + try (jakarta.ws.rs.core.Response response = clientResource.authorization().resources().create(representation)) { representation.setId(response.readEntity(ResourceRepresentation.class).getId()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/PolicyEnforcerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/PolicyEnforcerTest.java index c5b5ef7f0202..e09def8e14d8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/PolicyEnforcerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/PolicyEnforcerTest.java @@ -23,8 +23,8 @@ import static org.keycloak.common.Profile.Feature.AUTHORIZATION; import javax.security.cert.X509Certificate; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.HttpHeaders; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -654,7 +654,7 @@ public void testLazyLoadPaths() { representation.setName("Resource " + i); representation.setUri("/api/" + i); - javax.ws.rs.core.Response response = clientResource.authorization().resources().create(representation); + jakarta.ws.rs.core.Response response = clientResource.authorization().resources().create(representation); representation.setId(response.readEntity(ResourceRepresentation.class).getId()); @@ -725,7 +725,7 @@ public void testSetMethodConfigs() { representation.setUris(Collections.singleton("/api-method/*")); ResourcesResource resources = clientResource.authorization().resources(); - javax.ws.rs.core.Response response = resources.create(representation); + jakarta.ws.rs.core.Response response = resources.create(representation); representation.setId(response.readEntity(ResourceRepresentation.class).getId()); @@ -832,7 +832,7 @@ private ResourceRepresentation createResource(ClientResource clientResource, Str representation.setUri(uri); representation.setScopes(Arrays.asList(scopes).stream().map(ScopeRepresentation::new).collect(Collectors.toSet())); - javax.ws.rs.core.Response response = clientResource.authorization().resources().create(representation); + jakarta.ws.rs.core.Response response = clientResource.authorization().resources().create(representation); representation.setId(response.readEntity(ResourceRepresentation.class).getId()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementTest.java index 4c870048daef..d36d31adcccb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementTest.java @@ -28,8 +28,8 @@ import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourcePermissionManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourcePermissionManagementTest.java index f67eee73cebc..b67be15845d4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourcePermissionManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourcePermissionManagementTest.java @@ -21,8 +21,8 @@ import java.util.Collections; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceServerManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceServerManagementTest.java index 3509f9a77b29..4c0f7889e21d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceServerManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceServerManagementTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/RolePolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/RolePolicyManagementTest.java index 28b31239a929..c7dc9aaad811 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/RolePolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/RolePolicyManagementTest.java @@ -24,8 +24,8 @@ import java.util.Collections; import java.util.stream.Collectors; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopeManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopeManagementTest.java index 96a15a1df794..3d3ff2c563e3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopeManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopeManagementTest.java @@ -25,8 +25,8 @@ import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopePermissionManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopePermissionManagementTest.java index 7db008461702..dd00323dce85 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopePermissionManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopePermissionManagementTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/TimePolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/TimePolicyManagementTest.java index d73823d1d850..9bc84daae95a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/TimePolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/TimePolicyManagementTest.java @@ -21,8 +21,8 @@ import java.util.Collections; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/UserPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/UserPolicyManagementTest.java index 8ec2cb896a2b..a20131873edb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/UserPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/UserPolicyManagementTest.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java index 787ce5e5cf2c..0838e99ec5a4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java @@ -29,11 +29,11 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.openqa.selenium.TimeoutException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.net.URI; import java.util.Arrays; import java.util.Collections; @@ -198,7 +198,7 @@ public void testRetrieveToken() throws Exception { OAuthClient.AccessTokenResponse accessTokenResponse = oauth.realm(bc.consumerRealmName()).clientId("broker-app").doGrantAccessTokenRequest("broker-app-secret", bc.getUserLogin(), bc.getUserPassword()); AtomicReference accessToken = (AtomicReference) new AtomicReference<>(accessTokenResponse.getAccessToken()); - Client client = javax.ws.rs.client.ClientBuilder.newBuilder().register((ClientRequestFilter) request -> request.getHeaders().add(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken.get())).build(); + Client client = jakarta.ws.rs.client.ClientBuilder.newBuilder().register((ClientRequestFilter) request -> request.getHeaders().add(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken.get())).build(); try { WebTarget target = client.target(Urls.identityProviderRetrieveToken(URI.create(getConsumerRoot() + "/auth"), bc.getIDPAlias(), bc.consumerRealmName())); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java index a6d12307eac5..ec5f15d25d46 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java @@ -54,9 +54,9 @@ import org.keycloak.testsuite.util.UserBuilder; import org.openqa.selenium.TimeoutException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; import java.net.URI; import java.util.Collections; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java index 2ee051453935..c6d7a7c0aead 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.mail.internet.MimeMessage; -import javax.ws.rs.core.Response; +import jakarta.mail.internet.MimeMessage; +import jakarta.ws.rs.core.Response; import com.google.common.collect.ImmutableMap; import org.hamcrest.MatcherAssert; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupMapperTest.java index 8061f5297bc0..756d2f56df05 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupMapperTest.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * @author Artur Baltabayev, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java index 7b16031864c9..4b9dd0fcd21d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.broker; import java.util.Collections; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.arquillian.graphene.page.Page; import org.junit.Assume; import org.junit.Before; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOIDCBrokerWithSignatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOIDCBrokerWithSignatureTest.java index 3dd8d9a7c5a7..043e714b6fd0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOIDCBrokerWithSignatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOIDCBrokerWithSignatureTest.java @@ -19,8 +19,8 @@ import java.io.Closeable; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import org.junit.Before; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomSignAlgTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomSignAlgTest.java index 47812be1d4c0..0ea634283fce 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomSignAlgTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomSignAlgTest.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java index 83bf1d71cf03..e19427cb0a26 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java @@ -39,7 +39,7 @@ import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.WaitUtils; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Collections; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerAllowedClockSkewTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerAllowedClockSkewTest.java index 00753d0a005a..5aaa65111fa3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerAllowedClockSkewTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerAllowedClockSkewTest.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.broker; import java.io.Closeable; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matchers; import org.junit.Assert; import static org.junit.Assert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java index 553072eb760b..7382b2b79a0b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java @@ -20,7 +20,7 @@ import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java index 29646e39ce4a..2fde9f03d58a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java @@ -38,7 +38,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matchers; import org.junit.Assert; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java index ed82ab47189f..f4451755610e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java @@ -43,7 +43,7 @@ import java.util.Properties; import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.arquillian.graphene.page.Page; import org.junit.Before; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedBrokerTest.java index fd335695e25f..784446b13bb3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedBrokerTest.java @@ -36,7 +36,7 @@ import java.util.Map.Entry; import java.util.Set; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import javax.xml.crypto.dsig.XMLSignature; import javax.xml.namespace.QName; import org.apache.http.HttpResponse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToGroupMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToGroupMapperTest.java index ba6886810505..776a258f44fd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToGroupMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToGroupMapperTest.java @@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * @author Artur Baltabayev, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java index 570c61f53add..72b834daecd9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java @@ -56,12 +56,12 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.io.FileInputStream; import java.util.List; import java.util.Properties; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientRegistrationTest.java index 414b6c3d00e9..a2ce17deca54 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientRegistrationTest.java @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import java.util.Collections; import java.util.LinkedList; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java index 2e4cbb11a6f7..ec7c987a392a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java @@ -21,8 +21,8 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.containsString; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response.Status; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java index be426458b3da..ea7294e33613 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java @@ -35,10 +35,10 @@ import org.keycloak.testsuite.util.RealmBuilder; import java.net.URI; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java index 8a79c125c441..9217e0ab4227 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java @@ -62,7 +62,7 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java index 2824311de661..924cf96dd94e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java @@ -46,8 +46,8 @@ import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java index 0eedd5c91c4c..1752854e164e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java @@ -9,10 +9,10 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java index 790aa51d7c32..843a9a29ec25 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java index fa25ac1daccb..8719ba286b94 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java @@ -48,8 +48,8 @@ import org.keycloak.testsuite.util.UserInfoClientUtil; import org.keycloak.testsuite.util.UserManager; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Base64; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java index c9b5b9f01f43..5689ce963e47 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java @@ -62,8 +62,8 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionClusterTest.java index 3009a5ad3477..a02967ff1d97 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionClusterTest.java @@ -35,7 +35,7 @@ import org.keycloak.testsuite.pages.LoginUpdateProfilePage; import org.keycloak.testsuite.util.OAuthClient; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.util.HashSet; import java.util.Set; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java index 2dd2508c1fd9..6c9416fa5aba 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java @@ -21,7 +21,7 @@ import static org.keycloak.testsuite.util.WaitUtils.pause; import java.io.IOException; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; import org.jboss.arquillian.graphene.page.Page; import org.junit.Test; import org.keycloak.services.managers.AuthenticationSessionManager; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientInvalidationClusterTest.java index 1344d77e8fd4..bb2006261437 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientInvalidationClusterTest.java @@ -8,8 +8,8 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ComponentInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ComponentInvalidationClusterTest.java index 9b684677a2c9..2d167e496d62 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ComponentInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ComponentInvalidationClusterTest.java @@ -11,8 +11,8 @@ import org.keycloak.testsuite.components.amphibian.TestAmphibianProvider; import org.keycloak.testsuite.components.amphibian.TestAmphibianProviderFactoryImpl; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java index b97d6e91e640..d6eb0f962d91 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java @@ -9,8 +9,8 @@ import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.util.GroupBuilder; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RealmInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RealmInvalidationClusterTest.java index a054e7efbb55..96f40df4555b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RealmInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RealmInvalidationClusterTest.java @@ -5,7 +5,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.arquillian.ContainerInfo; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RoleInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RoleInvalidationClusterTest.java index 28d519fdb04a..c1d62ac761ba 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RoleInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RoleInvalidationClusterTest.java @@ -35,7 +35,7 @@ import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.util.RoleBuilder; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserInvalidationClusterTest.java index 2e586f5aed26..92459c2a9f3b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserInvalidationClusterTest.java @@ -7,8 +7,8 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/ActionTokenCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/ActionTokenCrossDCTest.java index d74efb3ffd0c..d03ab5ef71b6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/ActionTokenCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/ActionTokenCrossDCTest.java @@ -33,9 +33,9 @@ import java.io.IOException; import java.util.LinkedList; import java.util.List; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import javax.ws.rs.core.Response; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import jakarta.ws.rs.core.Response; import org.jboss.arquillian.graphene.page.Page; import org.junit.Assert; import org.junit.Assume; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/BruteForceCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/BruteForceCrossDCTest.java index 200b58b14d2e..99b1555935cd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/BruteForceCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/BruteForceCrossDCTest.java @@ -38,7 +38,7 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import java.io.IOException; import java.net.URISyntaxException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/InvalidationCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/InvalidationCrossDCTest.java index 22a173bf3d6a..644c01694c53 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/InvalidationCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/InvalidationCrossDCTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.BeforeClass; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/LastSessionRefreshCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/LastSessionRefreshCrossDCTest.java index b0f5dc04a6d9..347ed7340961 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/LastSessionRefreshCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/LastSessionRefreshCrossDCTest.java @@ -33,7 +33,7 @@ import org.keycloak.testsuite.arquillian.annotation.JmxInfinispanCacheStatistics; import org.keycloak.testsuite.util.OAuthClient; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/LoginCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/LoginCrossDCTest.java index dacca6fb15a1..bde9a1af8382 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/LoginCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/LoginCrossDCTest.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.crossdc; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.http.client.methods.CloseableHttpResponse; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/SessionExpirationCrossDCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/SessionExpirationCrossDCTest.java index 69d292d59cd3..6651750a4beb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/SessionExpirationCrossDCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/crossdc/SessionExpirationCrossDCTest.java @@ -24,7 +24,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.hamcrest.Matchers; import org.junit.After; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java index 83d01f7f6b1d..3a70cc468d12 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java @@ -25,7 +25,7 @@ import org.keycloak.utils.MediaType; import org.openqa.selenium.By; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java index 6cefd84493e2..141c8ca23e89 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java @@ -20,8 +20,8 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.ietf.jgss.GSSCredential; import org.jboss.arquillian.graphene.page.Page; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java index 5c4010427812..3be877d77dbe 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java @@ -32,7 +32,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; import javax.security.sasl.Sasl; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.http.NameValuePair; import org.apache.http.client.HttpClient; import org.apache.http.client.utils.URLEncodedUtils; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapCrossRealmTrustTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapCrossRealmTrustTest.java index bea9e63ea379..684ca55d3fe5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapCrossRealmTrustTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapCrossRealmTrustTest.java @@ -31,7 +31,7 @@ import org.keycloak.testsuite.KerberosEmbeddedServer; import org.keycloak.testsuite.util.OAuthClient; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapTest.java index 53df3add34a1..48cc9965ef00 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapTest.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.Assert; import org.junit.Before; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java index 9fcceeb3ba50..094d16c2ff4f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java @@ -19,9 +19,9 @@ import java.net.URI; import java.util.List; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; @@ -142,7 +142,7 @@ public void noProvider() throws Exception { // Follow login with HttpClient. Improve if needed - MultivaluedMap params = new javax.ws.rs.core.MultivaluedHashMap<>(); + MultivaluedMap params = new jakarta.ws.rs.core.MultivaluedHashMap<>(); params.putSingle("username", "test-user@localhost"); params.putSingle("password", "password"); Response response = client.target(url).request() diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java index 7913c5e3b368..d64466a87699 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; import org.junit.Assert; import org.junit.ClassRule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiWithUserProfileTest.java index ae8e6151dbf4..c8235a275e96 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiWithUserProfileTest.java @@ -27,8 +27,8 @@ import static org.keycloak.util.JsonSerialization.readValue; import static org.keycloak.util.JsonSerialization.writeValueAsString; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPBinaryAttributesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPBinaryAttributesTest.java index 5ccbbbc16d17..59221c20af69 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPBinaryAttributesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPBinaryAttributesTest.java @@ -41,8 +41,8 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncTest.java index fd672a9169fd..44f2c0f0b3fe 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncTest.java @@ -46,7 +46,7 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import java.util.Date; import java.util.Set; import java.util.stream.Collectors; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncWithGroupsPathTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncWithGroupsPathTest.java index 68f3b8bd23e5..22115bcb3008 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncWithGroupsPathTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncWithGroupsPathTest.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.federation.ldap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.Assert; import org.junit.Before; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java index 72472cfb2ec9..4457e46f844a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.stream.Collectors; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.jboss.arquillian.graphene.page.Page; import org.junit.ClassRule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java index 50c55c26e44f..bd154b58b8fd 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java @@ -77,7 +77,7 @@ import org.keycloak.testsuite.util.OAuthClient; import javax.naming.AuthenticationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java index 9a8f01e957e4..b9586d1d1b61 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java @@ -49,7 +49,7 @@ import org.keycloak.testsuite.util.LDAPTestUtils; import org.openqa.selenium.By; -import javax.ws.rs.ClientErrorException; +import jakarta.ws.rs.ClientErrorException; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSamlIdPInitiatedVaryingLetterCaseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSamlIdPInitiatedVaryingLetterCaseTest.java index 08ffe3cf3be2..a037a2d28457 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSamlIdPInitiatedVaryingLetterCaseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSamlIdPInitiatedVaryingLetterCaseTest.java @@ -59,8 +59,8 @@ import com.google.common.collect.ImmutableMap; import java.net.URI; import java.util.UUID; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java index f1ad720ac958..b4a220e1f2f5 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java @@ -60,7 +60,7 @@ import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.WaitUtils; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java index 0cb5bca34679..5f400d6df365 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; import org.junit.Assert; import org.junit.Assume; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java index 9e68fd61c2f7..4fd73745f642 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.federation.storage; +import jakarta.ws.rs.core.Response; import org.jboss.arquillian.graphene.page.Page; import org.junit.Before; import org.junit.BeforeClass; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java index 300a95d30786..333a308b8405 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java @@ -55,13 +55,13 @@ import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.TokenUtil; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URISyntaxException; import java.util.Calendar; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java index f65bc0f45df7..88b20b15af65 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java @@ -20,7 +20,7 @@ import org.keycloak.testsuite.util.RealmBuilder; import java.io.Closeable; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import java.io.File; import java.util.HashSet; import java.util.Properties; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java index 46b66884f7a7..449c27c17b0c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java @@ -40,7 +40,7 @@ import org.keycloak.testsuite.AbstractAuthTest; import java.io.Closeable; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import java.io.File; import java.util.LinkedList; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java index df82a957f5e4..340beaa7282a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java @@ -34,7 +34,7 @@ import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.HardcodedGroupStorageProviderFactory; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URISyntaxException; import java.util.stream.Collectors; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java index b0da8e65600d..47fe16a9c51b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java index 85d727187cdc..5af546a56f3e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java @@ -52,9 +52,9 @@ import org.keycloak.testsuite.util.TestCleanup; import org.openqa.selenium.Cookie; -import javax.mail.internet.MimeMessage; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.mail.internet.MimeMessage; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java index 8f6169f26ebd..50709befb2a4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java @@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.jboss.arquillian.graphene.page.Page; import org.junit.Before; import org.junit.Rule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java index e6e9c4f62712..cc96529ff4f9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java @@ -49,7 +49,7 @@ import org.keycloak.testsuite.util.RealmRepUtil; import org.keycloak.testsuite.util.UserBuilder; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.net.MalformedURLException; import java.util.Calendar; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java index ebc5eecfb303..f2a78d6fc0fd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java @@ -56,12 +56,12 @@ import org.keycloak.testsuite.util.RealmRepUtil; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.keycloak.testsuite.util.Matchers.statusCodeIs; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java index 99856505e4b6..c185ff17d9c6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java @@ -51,12 +51,12 @@ import org.keycloak.util.BasicAuthHelper; import org.openqa.selenium.By; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java index eb50142456ca..8e7903d96692 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.arquillian.graphene.page.Page; import org.junit.After; import org.junit.Assert; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java index c43d81e8375c..9813be9bf445 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java @@ -42,11 +42,11 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.WaitUtils; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.MalformedURLException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java index e18b53a434bd..e8304251a5ee 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java @@ -42,7 +42,7 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; -import javax.ws.rs.BadRequestException; +import jakarta.ws.rs.BadRequestException; import java.security.spec.KeySpec; import static org.junit.Assert.assertArrayEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java index 4fb88f407ccc..18b087357b76 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java @@ -51,8 +51,8 @@ import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.UserBuilder; -import javax.mail.internet.MimeMessage; -import javax.ws.rs.core.Response; +import jakarta.mail.internet.MimeMessage; +import jakarta.ws.rs.core.Response; import java.io.IOException; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java index bb29150dce4c..4fa1eb4929a9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java @@ -48,7 +48,7 @@ import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.util.*; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.util.Arrays; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java index 299f0933946e..c02d9ace03c7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java @@ -63,8 +63,8 @@ import org.keycloak.testsuite.util.UserActionTokenBuilder; import org.keycloak.testsuite.util.UserBuilder; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.io.Closeable; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ScriptAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ScriptAuthenticatorTest.java index 63cd93950a90..4a5a32123276 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ScriptAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ScriptAuthenticatorTest.java @@ -45,7 +45,7 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Map; import java.util.UUID; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java index c103d8558903..53ce9c6f14ad 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.jboss.arquillian.graphene.page.Page; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java index e65da2248320..993df9c48728 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java @@ -20,8 +20,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.util.Arrays; import org.jboss.arquillian.graphene.page.Page; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/LoginPageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/LoginPageTest.java index 767940db7fd1..e43f8cf7ba8b 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/LoginPageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/LoginPageTest.java @@ -39,7 +39,7 @@ import org.keycloak.testsuite.pages.LanguageComboboxAwarePage; import org.keycloak.testsuite.pages.LoginPage; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.arquillian.graphene.page.Page; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedEcdsaKeyProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedEcdsaKeyProviderTest.java index 9c0f6821d067..761e1e8f74ed 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedEcdsaKeyProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedEcdsaKeyProviderTest.java @@ -26,8 +26,8 @@ import java.security.spec.X509EncodedKeySpec; import java.util.List; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.jboss.arquillian.graphene.page.Page; import org.junit.Rule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedHmacKeyProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedHmacKeyProviderTest.java index a43a51a94d8e..6ab0deee6b43 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedHmacKeyProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedHmacKeyProviderTest.java @@ -37,7 +37,7 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.runonserver.RunHelpers; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedRsaKeyProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedRsaKeyProviderTest.java index 3eefd801a948..116f7cf5f023 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedRsaKeyProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/GeneratedRsaKeyProviderTest.java @@ -39,7 +39,7 @@ import org.keycloak.testsuite.util.KeyUtils; import org.keycloak.utils.StringUtil; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.security.interfaces.RSAPublicKey; import java.util.Arrays; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/ImportedRsaKeyProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/ImportedRsaKeyProviderTest.java index 1bf8a7529299..259f065552ba 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/ImportedRsaKeyProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/ImportedRsaKeyProviderTest.java @@ -42,7 +42,7 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.security.KeyPair; import java.security.cert.Certificate; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java index 86739a62b0a0..1bec3422072b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/JavaKeystoreKeyProviderTest.java @@ -38,7 +38,7 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.KeystoreUtils; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import static io.smallrye.common.constraint.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/KeyRotationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/KeyRotationTest.java index d52477361738..c73302468009 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/KeyRotationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/keys/KeyRotationTest.java @@ -52,7 +52,7 @@ import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.UserInfoClientUtil; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.security.KeyPair; import java.security.PublicKey; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/metrics/MetricsRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/metrics/MetricsRestServiceTest.java index 66060a80c471..7fb149fce866 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/metrics/MetricsRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/metrics/MetricsRestServiceTest.java @@ -17,9 +17,9 @@ package org.keycloak.testsuite.metrics; import java.util.List; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.junit.BeforeClass; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java index a0a186b5d21c..f12ebf6d911e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java @@ -23,7 +23,7 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.migration.Migration; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import java.util.List; import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java index 6bfc59ae8063..7aca249f4fb7 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java @@ -84,13 +84,13 @@ import org.keycloak.util.TokenUtil; import org.openqa.selenium.By; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; import java.util.LinkedList; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java index f3de5bd711fe..c70d8d5ee801 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java @@ -36,7 +36,7 @@ import org.keycloak.testsuite.util.OAuthClient; import org.openqa.selenium.By; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java index 6956af4d1c27..49ccc66c1214 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java @@ -51,7 +51,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public class BackchannelLogoutTest extends AbstractNestedBrokerTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java index 698007abd2f3..ff43586b8689 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java index 900feccb1e31..3d25c5b3bf19 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java @@ -94,7 +94,7 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java index fcc18fb68857..64d363be10fb 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeSAML2Test.java @@ -64,12 +64,12 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.security.PrivateKey; import java.security.PublicKey; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java index d600f433539b..d5ec1076cb63 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientTokenExchangeTest.java @@ -55,12 +55,12 @@ import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.util.BasicAuthHelper; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LegacyLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LegacyLogoutTest.java index a1044bcb79e8..90c6d4cdf08e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LegacyLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LegacyLogoutTest.java @@ -21,7 +21,7 @@ import java.io.Closeable; import java.util.Collections; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import org.hamcrest.MatcherAssert; import org.jboss.arquillian.graphene.page.Page; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutCorsTest.java index 244305116a61..8ccc55d77f14 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutCorsTest.java @@ -20,7 +20,7 @@ import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.http.client.methods.CloseableHttpResponse; import org.junit.Before; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java index a66f105238ee..b7cef62c9bde 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java @@ -42,9 +42,9 @@ import org.keycloak.testsuite.pages.LoginPage; import java.util.List; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java index a939891ef605..648a6c165fc3 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java @@ -54,7 +54,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java index 342ab7d2120f..ea9e37180a81 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java @@ -27,7 +27,7 @@ import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.security.MessageDigest; import java.util.List; import java.util.stream.Stream; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java index 6c50bd9c30c8..e3d28cc9aed2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java @@ -10,7 +10,7 @@ import java.util.Collection; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java index c99f266abba3..5e5859a90768 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java @@ -58,8 +58,8 @@ import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.keycloak.testsuite.util.UserInfoClientUtil; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java index a6a17b4bee36..786054d4a881 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java @@ -67,7 +67,7 @@ import org.keycloak.testsuite.utils.tls.TLSUtils; import org.keycloak.util.TokenUtil; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java index ac93e73a388a..34759e3d80a9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java @@ -61,10 +61,10 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.is; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java index b6fcaa7c4de8..6f69d886478f 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java @@ -72,13 +72,13 @@ import org.keycloak.util.JsonSerialization; import org.openqa.selenium.Cookie; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java index 0e0ec773a9db..43b86b491bee 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java @@ -65,9 +65,9 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.UserManager; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.LinkedList; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java index 0eaec1b9d447..760a15ca87c8 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java @@ -56,8 +56,8 @@ import org.keycloak.testsuite.util.TokenSignatureUtil; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java index 219888573c2a..363b63533959 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java @@ -61,7 +61,7 @@ import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.io.UnsupportedEncodingException; import java.util.ArrayList; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationCorsTest.java index 5e2f83f965e7..445c16c3bacd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationCorsTest.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.List; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.http.client.methods.CloseableHttpResponse; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationTest.java index e07130ac21e6..fae6d907c9b9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationTest.java @@ -30,10 +30,10 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.http.NameValuePair; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/UserInfoEndpointCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/UserInfoEndpointCorsTest.java index 92501490200a..e26ae1b43299 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/UserInfoEndpointCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/UserInfoEndpointCorsTest.java @@ -9,9 +9,9 @@ import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.UserInfoClientUtil; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java index abc5cc3fb044..b31f98bc82af 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java @@ -21,12 +21,12 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java index a443c8f0fd9c..07c72fc7fba7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Optional; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.apache.http.client.methods.CloseableHttpResponse; import org.junit.Assert; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java index d09f03c5dc3e..9bd40e08c844 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java @@ -30,7 +30,7 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.List; import java.util.Optional; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java index 694ae20c469c..7f349dcd6b0c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java @@ -36,7 +36,7 @@ import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenResponseModeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenResponseModeTest.java index fdd103be02ad..dd0833a8da4c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenResponseModeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenResponseModeTest.java @@ -34,7 +34,7 @@ import org.keycloak.testsuite.util.OAuthClient; import org.openqa.selenium.By; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java index d579ba9724e6..8209b600b888 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java @@ -91,9 +91,9 @@ import org.keycloak.util.JWKSUtils; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.security.PublicKey; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java index eb24124619fc..962cb7a2f812 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java @@ -37,7 +37,7 @@ import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.HashMap; import java.util.List; import java.util.Optional; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java index 752d1a9b4424..1230f5c9027f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java @@ -49,8 +49,8 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.AccountHelper; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java index c4d22c8e8d81..b24286b34979 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCWellKnownProviderTest.java @@ -56,11 +56,11 @@ import org.keycloak.testsuite.wellknown.CustomOIDCWellKnownProviderFactory; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java index e49b98b07c77..42d4e244ee5a 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java @@ -84,14 +84,14 @@ import org.keycloak.util.TokenUtil; import org.keycloak.utils.MediaType; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; import java.security.PrivateKey; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java index f96727e9488d..885f11021c4e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java @@ -41,7 +41,7 @@ import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.util.TokenSignatureUtil; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenShiftTokenReviewEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenShiftTokenReviewEndpointTest.java index cff63617950c..f3f256914668 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenShiftTokenReviewEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenShiftTokenReviewEndpointTest.java @@ -57,8 +57,8 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Arrays; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java index e3102800a549..62b8b63b5168 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/openshift/OpenshiftClientStorageTest.java @@ -51,7 +51,7 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.OAuthClient; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Arrays; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordHistoryPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordHistoryPolicyTest.java index 124ff980e585..d402e9692bd2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordHistoryPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordHistoryPolicyTest.java @@ -17,8 +17,8 @@ package org.keycloak.testsuite.policy; import java.util.function.Consumer; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AbstractSamlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AbstractSamlTest.java index 37b1bd96e349..f2bc59ce53d9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AbstractSamlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AbstractSamlTest.java @@ -15,8 +15,8 @@ import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.util.SamlClient; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import java.net.URI; import java.security.KeyFactory; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java index 4acaa63d4506..e799c1ddd3fd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java @@ -43,7 +43,7 @@ import org.keycloak.testsuite.utils.io.IOUtil; import org.w3c.dom.Document; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import javax.xml.transform.dom.DOMSource; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AudienceProtocolMappersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AudienceProtocolMappersTest.java index e675a102e0b0..08ef729d8707 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AudienceProtocolMappersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AudienceProtocolMappersTest.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.greaterThan; import org.junit.After; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java index 6f695e5ccd25..d9e18c73113d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java @@ -30,9 +30,9 @@ import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BrokerTest.java index 09ef329de05d..eea6a7047bd8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BrokerTest.java @@ -58,7 +58,7 @@ import java.util.Objects; import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import org.apache.http.Header; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IdpInitiatedLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IdpInitiatedLoginTest.java index cddd3a8a1a8c..18f378283483 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IdpInitiatedLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IdpInitiatedLoginTest.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import org.junit.Test; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsInAnyOrder; 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 b392436291e0..f84a438bf106 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 @@ -54,8 +54,8 @@ import java.util.List; import java.util.UUID; import java.util.function.Consumer; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilderException; +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; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java index 4fae8b9db783..38f241be2860 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java @@ -29,9 +29,9 @@ import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.SamlClientBuilder; -import javax.ws.rs.core.Response; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPMessage; +import jakarta.ws.rs.core.Response; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPMessage; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientCertificateExpirationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientCertificateExpirationTest.java index f3936a1bc455..9aade283f6ea 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientCertificateExpirationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientCertificateExpirationTest.java @@ -22,7 +22,7 @@ import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.Test; import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_NAME; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java index 448c71e3bbc4..1a769dba4755 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java @@ -33,8 +33,8 @@ import org.keycloak.testsuite.util.SamlClient; import org.w3c.dom.Document; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; import java.util.HashMap; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java index aaf4e6fb84e2..c87ced92e23e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.Matcher; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedSAMLScriptMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedSAMLScriptMapperTest.java index 18c007cfaaff..2cff2dba415b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedSAMLScriptMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedSAMLScriptMapperTest.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.stream.Stream; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptAuthenticatorTest.java index 6b0cc9ede4b8..34dde70fa96a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptAuthenticatorTest.java @@ -22,7 +22,7 @@ import java.io.IOException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptPolicyTest.java index bc78f8f272c4..c18b73ed2ecb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptPolicyTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertFalse; import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.List; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java index 9b2cb03c0163..3a666d4c4c92 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java @@ -48,7 +48,7 @@ import org.keycloak.testsuite.util.OAuthClient; import org.keycloak.testsuite.pages.ErrorPage; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.assertSessionCount; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/DefaultHostnameTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/DefaultHostnameTest.java index 75ad4de29a9b..ecdf3da1e03c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/DefaultHostnameTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/DefaultHostnameTest.java @@ -31,7 +31,7 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdminEventPaths.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdminEventPaths.java index e322432559b1..75241c54f14a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdminEventPaths.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdminEventPaths.java @@ -39,7 +39,7 @@ import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UsersResource; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java index e2bb96785619..c40bd287104e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java @@ -19,10 +19,10 @@ import org.jboss.logging.Logger; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage.RecipientType; +import jakarta.mail.internet.MimeMultipart; import java.io.IOException; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java index 3323f1bda631..9e3d226495fd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java @@ -21,10 +21,10 @@ import com.icegreen.greenmail.util.ServerSetup; import org.jboss.logging.Logger; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage.RecipientType; +import jakarta.mail.internet.MimeMultipart; import java.io.IOException; import java.lang.Thread.UncaughtExceptionHandler; import java.net.SocketException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java index 9d70b075a646..2e895e5cd84b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; /** * @author Bruno Oliveira. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java index cfaf5e26bc6f..fd457b857423 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java @@ -20,7 +20,7 @@ import org.jboss.logging.Logger; import org.subethamail.smtp.server.SMTPServer; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java index c0116d58b421..21423f15c181 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java @@ -22,7 +22,7 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginTotpPage; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.net.URISyntaxException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java index 56b0ecc177e2..7ce26358b53f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java @@ -63,7 +63,7 @@ import org.keycloak.testsuite.util.UserBuilder; import org.openqa.selenium.WebDriver; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.lang.reflect.Field; import java.net.URI; import java.util.ArrayList; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java index 57f78a86cee3..b86e9d856d9f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java @@ -31,7 +31,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.pages.AppPage; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509DirectGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509DirectGrantTest.java index 7e1448bbaffb..ab6ddbcc879b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509DirectGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509DirectGrantTest.java @@ -39,7 +39,7 @@ import org.keycloak.testsuite.util.PhantomJSBrowser; import org.openqa.selenium.WebDriver; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderFailOpenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderFailOpenTest.java index 6ba93711dbe7..fc2ce0f13ee1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderFailOpenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderFailOpenTest.java @@ -7,8 +7,8 @@ import java.nio.file.Paths; import java.util.function.Supplier; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.io.IOUtils; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderSpecificCertTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderSpecificCertTest.java index aaa369dc1cba..27e24dcf6a59 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderSpecificCertTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderSpecificCertTest.java @@ -27,7 +27,7 @@ import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; import org.keycloak.testsuite.util.OAuthClient; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderTest.java index 95c5485c783a..68d08274dc90 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderTest.java @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; import org.keycloak.testsuite.util.OAuthClient; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/tomcat/TomcatDeploymentArchiveProcessorUtils.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/tomcat/TomcatDeploymentArchiveProcessorUtils.java index 017c663a6427..8170c4a999f5 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/tomcat/TomcatDeploymentArchiveProcessorUtils.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/tomcat/TomcatDeploymentArchiveProcessorUtils.java @@ -11,7 +11,7 @@ import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils; import org.w3c.dom.Document; -import javax.ws.rs.ApplicationPath; +import jakarta.ws.rs.ApplicationPath; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -114,7 +114,7 @@ public static boolean isJaxRSApp(Archive archive) { ).values().stream() .filter(node -> node.getAsset() instanceof ClassAsset) .map(node -> ((ClassAsset)node.getAsset()).getSource()) - .filter(clazz -> clazz.isAnnotationPresent(javax.ws.rs.Path.class)) + .filter(clazz -> clazz.isAnnotationPresent(jakarta.ws.rs.Path.class)) .collect(Collectors.toSet()); return !classes.isEmpty(); diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/SimpleWebXmlParser.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/SimpleWebXmlParser.java index 96ec3d1dea38..45f0623399d6 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/SimpleWebXmlParser.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/SimpleWebXmlParser.java @@ -23,9 +23,9 @@ import java.util.Map; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.Servlet; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; import io.undertow.servlet.api.DeploymentInfo; import io.undertow.servlet.api.ErrorPage; diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/UndertowDeployerHelper.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/UndertowDeployerHelper.java index 7747d7524800..271962432140 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/UndertowDeployerHelper.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/UndertowDeployerHelper.java @@ -36,8 +36,8 @@ import org.w3c.dom.Document; import org.xml.sax.SAXException; -import javax.servlet.Servlet; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.Servlet; +import jakarta.servlet.annotation.WebServlet; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/MigrationModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/MigrationModelTest.java index 0286350d39af..c0f8ed3c77af 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/MigrationModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/MigrationModelTest.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.model; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Test; diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/JsonConfigProviderFactory.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/JsonConfigProviderFactory.java index bd435921f0d5..fb560af67468 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/JsonConfigProviderFactory.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/JsonConfigProviderFactory.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.keycloak.common.util.Resteasy; import org.keycloak.common.util.SystemEnvProperties; import org.keycloak.util.JsonSerialization; diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java index 583b84f3843c..2baa40785c1b 100755 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java @@ -63,7 +63,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; -import javax.servlet.DispatcherType; +import jakarta.servlet.DispatcherType; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -82,7 +82,7 @@ import java.util.Properties; import java.util.function.Function; import java.util.stream.Stream; -import javax.servlet.Filter; +import jakarta.servlet.Filter; /** * @author Stian Thorgersen diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java index 1c8fe27a555e..73cdd625015f 100755 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java @@ -20,9 +20,9 @@ import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.ServerSetup; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage.RecipientType; +import jakarta.mail.internet.MimeMultipart; public class MailServer { diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/UndertowRequestFilter.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/UndertowRequestFilter.java index 979241d0a56c..f50919c4fc6f 100755 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/UndertowRequestFilter.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/UndertowRequestFilter.java @@ -19,12 +19,12 @@ import java.io.UnsupportedEncodingException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.keycloak.common.ClientConnection; import org.keycloak.models.KeycloakSessionFactory;