getRequestedClaims() {
String reqUriHash = reqUri.getFragment();
String reqUriWithoutFragment = reqUri.getScheme() + ":" + reqUri.getSchemeSpecificPart();
- javax.ws.rs.client.Client clientRequest = ClientBuilder.newClient();
+ jakarta.ws.rs.client.Client clientRequest = ClientBuilder.newClient();
try {
Response clientResponse = clientRequest.target(reqUriWithoutFragment).request().buildGet().invoke();
clientRequest.close();
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebService.java
index de81e110fc9..1f11ab3ef1b 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebService.java
@@ -8,18 +8,18 @@
import io.jans.as.model.authorize.AuthorizeRequestParam;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.FormParam;
-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.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.FormParam;
+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.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
/**
*
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java
index 9b265e80765..432cddd1cd7 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java
@@ -73,17 +73,17 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.Path;
-import javax.ws.rs.WebApplicationException;
-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.SecurityContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.WebApplicationException;
+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.SecurityContext;
import java.net.URI;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceValidator.java
index 3b75520d095..318d2fc76bc 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceValidator.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceValidator.java
@@ -30,13 +30,13 @@
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzRequest.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzRequest.java
index 033d0b99ada..1947c152077 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzRequest.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzRequest.java
@@ -1,11 +1,11 @@
package io.jans.as.server.authorize.ws.rs;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.SecurityContext;
import io.jans.as.model.common.ResponseMode;
import io.jans.as.model.util.Util;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.SecurityContext;
import java.util.List;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGathererService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGathererService.java
index 2b4ef29300c..b1ddfbb9e71 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGathererService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGathererService.java
@@ -25,14 +25,14 @@
import io.jans.util.StringHelper;
import org.slf4j.Logger;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGatheringSessionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGatheringSessionService.java
index bf0864799a3..440809701bb 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGatheringSessionService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGatheringSessionService.java
@@ -17,11 +17,11 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Yuriy Movchan
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationAction.java
index c7e5c83833e..446b18ce7ca 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationAction.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationAction.java
@@ -21,11 +21,11 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.IOException;
import java.io.Serializable;
import java.util.Date;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationRestWebService.java
index 97f16ff2ea5..9014a3dd07e 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationRestWebService.java
@@ -8,16 +8,16 @@
import io.jans.as.model.authorize.DeviceAuthorizationRequestParam;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-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.SecurityContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+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.SecurityContext;
/**
*
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationRestWebServiceImpl.java
index 7bd9d25bff9..daf085db735 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationRestWebServiceImpl.java
@@ -28,16 +28,16 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Path;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.UriBuilder;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/LoginAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/LoginAction.java
index c15795a000b..cf2bf64fdf3 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/LoginAction.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/LoginAction.java
@@ -8,9 +8,9 @@
import org.slf4j.Logger;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/LogoutAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/LogoutAction.java
index b8e42a3e7bd..1ec585baf4d 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/LogoutAction.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/LogoutAction.java
@@ -22,11 +22,11 @@
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebService.java
index b38d54f4176..c06ede56ba0 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebService.java
@@ -6,16 +6,16 @@
package io.jans.as.server.bcauthorize.ws.rs;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-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.SecurityContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+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.SecurityContext;
/**
* @author Javier Rojas Blum
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebServiceImpl.java
index 4898db72df1..e49cf179cf3 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebServiceImpl.java
@@ -47,14 +47,14 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Path;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelDeviceRegistrationRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelDeviceRegistrationRestWebService.java
index 80111e682d5..755b5fed143 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelDeviceRegistrationRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelDeviceRegistrationRestWebService.java
@@ -6,16 +6,16 @@
package io.jans.as.server.bcauthorize.ws.rs;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-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.SecurityContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+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.SecurityContext;
/**
* @author Javier Rojas Blum
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelDeviceRegistrationRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelDeviceRegistrationRestWebServiceImpl.java
index 2f18348cd13..1b4bd81d340 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelDeviceRegistrationRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelDeviceRegistrationRestWebServiceImpl.java
@@ -22,12 +22,12 @@
import io.jans.as.server.util.ServerUtil;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
import static io.jans.as.model.ciba.BackchannelDeviceRegistrationErrorResponseType.UNKNOWN_USER_ID;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/CIBAAuthorizeAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/CIBAAuthorizeAction.java
index 823ebafdbb9..39c550df0ee 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/CIBAAuthorizeAction.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/CIBAAuthorizeAction.java
@@ -10,9 +10,9 @@
import io.jans.as.model.configuration.AppConfiguration;
import org.slf4j.Logger;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.UUID;
import static io.jans.as.model.authorize.AuthorizeRequestParam.CLIENT_ID;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAAuthorizeParamsValidatorService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAAuthorizeParamsValidatorService.java
index 057cd0d0bc5..3e52aa2bd65 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAAuthorizeParamsValidatorService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAAuthorizeParamsValidatorService.java
@@ -12,10 +12,10 @@
import org.apache.commons.lang.BooleanUtils;
import org.apache.logging.log4j.util.Strings;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAConfigurationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAConfigurationService.java
index e639ff330d5..f308529c8d4 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAConfigurationService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAConfigurationService.java
@@ -12,9 +12,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import static io.jans.as.model.configuration.ConfigurationResponseClaim.BACKCHANNEL_AUTHENTICATION_ENDPOINT;
import static io.jans.as.model.configuration.ConfigurationResponseClaim.BACKCHANNEL_AUTHENTICATION_REQUEST_SIGNING_ALG_VALUES_SUPPORTED;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBADeviceRegistrationValidatorService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBADeviceRegistrationValidatorService.java
index 30641e40623..f8b756f5bbc 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBADeviceRegistrationValidatorService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBADeviceRegistrationValidatorService.java
@@ -9,9 +9,9 @@
import io.jans.as.model.error.DefaultErrorResponse;
import org.apache.logging.log4j.util.Strings;
-import javax.ejb.Stateless;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.Response;
import static io.jans.as.model.ciba.BackchannelAuthenticationErrorResponseType.INVALID_REQUEST;
import static io.jans.as.model.ciba.BackchannelAuthenticationErrorResponseType.UNKNOWN_USER_ID;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAEndUserNotificationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAEndUserNotificationService.java
index 543cc1e92d5..395f19af392 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAEndUserNotificationService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAEndUserNotificationService.java
@@ -17,9 +17,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.UUID;
import static io.jans.as.model.authorize.AuthorizeRequestParam.ACR_VALUES;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPingCallbackService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPingCallbackService.java
index 8a351e0b877..db7b683cb57 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPingCallbackService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPingCallbackService.java
@@ -13,9 +13,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* @author Javier Rojas Blum
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPushErrorService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPushErrorService.java
index e8f6895603e..11bbf1efe6c 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPushErrorService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPushErrorService.java
@@ -13,8 +13,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ejb.Stateless;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
/**
* @author Javier Rojas Blum
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPushTokenDeliveryService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPushTokenDeliveryService.java
index 1becf45d7b5..985c3629311 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPushTokenDeliveryService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAPushTokenDeliveryService.java
@@ -13,8 +13,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ejb.Stateless;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
/**
* @author Javier Rojas Blum
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientMetadataService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientMetadataService.java
index 16a759da79c..d1cf904982c 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientMetadataService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientMetadataService.java
@@ -13,9 +13,9 @@
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* @author Javier Rojas Blum
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientResponseService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientResponseService.java
index 190f3aafc36..e37526b21f5 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientResponseService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientResponseService.java
@@ -13,8 +13,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ejb.Stateless;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Named;
import static io.jans.as.model.register.RegisterRequestParam.BACKCHANNEL_AUTHENTICATION_REQUEST_SIGNING_ALG;
import static io.jans.as.model.register.RegisterRequestParam.BACKCHANNEL_CLIENT_NOTIFICATION_ENDPOINT;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterParamsValidatorService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterParamsValidatorService.java
index 0d2de89576b..068fcca7850 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterParamsValidatorService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterParamsValidatorService.java
@@ -17,11 +17,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.Response;
import java.util.List;
import static io.jans.as.model.common.BackchannelTokenDeliveryMode.PING;
@@ -80,7 +80,7 @@ public boolean validateParams(
}
if (Strings.isNotBlank(sectorIdentifierUri)) {
- javax.ws.rs.client.Client clientRequest = ClientBuilder.newClient();
+ jakarta.ws.rs.client.Client clientRequest = ClientBuilder.newClient();
String entity = null;
try {
Response clientResponse = clientRequest.target(sectorIdentifierUri).request().buildGet().invoke();
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/clientinfo/ws/rs/ClientInfoRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/clientinfo/ws/rs/ClientInfoRestWebService.java
index ac10c852706..b56f810c396 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/clientinfo/ws/rs/ClientInfoRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/clientinfo/ws/rs/ClientInfoRestWebService.java
@@ -6,17 +6,17 @@
package io.jans.as.server.clientinfo.ws.rs;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-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.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+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.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
/**
* Provides interface for Client Info REST web services
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/clientinfo/ws/rs/ClientInfoRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/clientinfo/ws/rs/ClientInfoRestWebServiceImpl.java
index 46cbcf7047f..5d3d49df07c 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/clientinfo/ws/rs/ClientInfoRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/clientinfo/ws/rs/ClientInfoRestWebServiceImpl.java
@@ -26,10 +26,10 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
import java.util.Set;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/crypto/random/RandomChallengeGenerator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/crypto/random/RandomChallengeGenerator.java
index d2ca74babec..eff8f3d184d 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/crypto/random/RandomChallengeGenerator.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/crypto/random/RandomChallengeGenerator.java
@@ -6,7 +6,7 @@
package io.jans.as.server.crypto.random;
-import javax.inject.Named;
+import jakarta.inject.Named;
import java.security.SecureRandom;
@Named("randomChallengeGenerator")
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/crypto/signature/SHA256withECDSASignatureVerification.java b/jans-auth-server/server/src/main/java/io/jans/as/server/crypto/signature/SHA256withECDSASignatureVerification.java
index b975b108b14..887cc435892 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/crypto/signature/SHA256withECDSASignatureVerification.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/crypto/signature/SHA256withECDSASignatureVerification.java
@@ -13,7 +13,7 @@
import org.bouncycastle.jce.spec.ECPublicKeySpec;
import org.bouncycastle.math.ec.ECPoint;
-import javax.inject.Named;
+import jakarta.inject.Named;
import java.security.GeneralSecurityException;
import java.security.KeyFactory;
import java.security.MessageDigest;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandler.java b/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandler.java
index 69b7466e820..1d531dc4137 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandler.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandler.java
@@ -11,13 +11,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.FacesException;
-import javax.faces.context.ExceptionHandler;
-import javax.faces.context.ExceptionHandlerWrapper;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ExceptionQueuedEvent;
-import javax.faces.event.ExceptionQueuedEventContext;
+import jakarta.faces.FacesException;
+import jakarta.faces.context.ExceptionHandler;
+import jakarta.faces.context.ExceptionHandlerWrapper;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ExceptionQueuedEvent;
+import jakarta.faces.event.ExceptionQueuedEventContext;
import java.util.Iterator;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandlerFactory.java b/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandlerFactory.java
index 6e80e02c7c6..4237f7157d4 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandlerFactory.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandlerFactory.java
@@ -6,8 +6,8 @@
package io.jans.as.server.exception;
-import javax.faces.context.ExceptionHandler;
-import javax.faces.context.ExceptionHandlerFactory;
+import jakarta.faces.context.ExceptionHandler;
+import jakarta.faces.context.ExceptionHandlerFactory;
/**
* Created by eugeniuparvan on 8/29/17.
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/exception/UncaughtException.java b/jans-auth-server/server/src/main/java/io/jans/as/server/exception/UncaughtException.java
index 5a4ea535ad3..cf639660645 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/exception/UncaughtException.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/exception/UncaughtException.java
@@ -9,14 +9,14 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.enterprise.inject.Vetoed;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import java.net.URI;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorrelationIdFilter.java b/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorrelationIdFilter.java
index 8c6e2c3a5ca..b350e27011c 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorrelationIdFilter.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorrelationIdFilter.java
@@ -6,11 +6,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.UUID;
import java.util.stream.Stream;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorsFilter.java b/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorsFilter.java
index e8b3f0f80f6..1a2a45c444e 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorsFilter.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorsFilter.java
@@ -16,14 +16,14 @@
import org.apache.commons.codec.binary.Base64;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.inject.Inject;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorsFilterConfig.java b/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorsFilterConfig.java
index f69f898d61e..1e24e2c04e8 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorsFilterConfig.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorsFilterConfig.java
@@ -9,8 +9,8 @@
import io.jans.as.model.configuration.AppConfiguration;
import io.jans.as.model.configuration.CorsConfigurationFilter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/i18n/LanguageBean.java b/jans-auth-server/server/src/main/java/io/jans/as/server/i18n/LanguageBean.java
index d772dfc1238..50b3244a2bf 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/i18n/LanguageBean.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/i18n/LanguageBean.java
@@ -14,13 +14,13 @@
import org.apache.logging.log4j.util.Strings;
import org.slf4j.Logger;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/idgen/ws/rs/InumGenerator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/idgen/ws/rs/InumGenerator.java
index ba6e284bddf..213b2fb1c6d 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/idgen/ws/rs/InumGenerator.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/idgen/ws/rs/InumGenerator.java
@@ -16,9 +16,9 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/introspection/ws/rs/IntrospectionWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/introspection/ws/rs/IntrospectionWebService.java
index 7e65890549a..037e60f7c67 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/introspection/ws/rs/IntrospectionWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/introspection/ws/rs/IntrospectionWebService.java
@@ -36,20 +36,20 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/jans/ws/rs/JansConfigurationWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/jans/ws/rs/JansConfigurationWS.java
index 4c99808a371..963c6612813 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/jans/ws/rs/JansConfigurationWS.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/jans/ws/rs/JansConfigurationWS.java
@@ -23,12 +23,12 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/JwkRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/JwkRestWebService.java
index bd52c266ea6..4604562e7e2 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/JwkRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/JwkRestWebService.java
@@ -6,13 +6,13 @@
package io.jans.as.server.jwk.ws.rs;
-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.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+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.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
/**
*
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/JwkRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/JwkRestWebServiceImpl.java
index dee8763818f..2590f00e64b 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/JwkRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/JwkRestWebServiceImpl.java
@@ -11,10 +11,10 @@
import io.jans.as.model.jwk.JSONWebKey;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/auth/AuthenticationMode.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/auth/AuthenticationMode.java
index e7de7d53f9e..b56b05ce0a2 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/auth/AuthenticationMode.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/auth/AuthenticationMode.java
@@ -6,7 +6,7 @@
package io.jans.as.server.model.auth;
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
import java.io.Serializable;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/JwtAuthorizationRequest.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/JwtAuthorizationRequest.java
index 25d49e0f920..b7bc277009a 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/JwtAuthorizationRequest.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/JwtAuthorizationRequest.java
@@ -41,9 +41,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.Response;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URLDecoder;
@@ -477,7 +477,7 @@ private static String queryRequest(@Nullable String requestUri, @Nullable Redire
String reqUriHash = reqUri.getFragment();
String reqUriWithoutFragment = reqUri.getScheme() + ":" + reqUri.getSchemeSpecificPart();
- javax.ws.rs.client.Client clientRequest = ClientBuilder.newClient();
+ jakarta.ws.rs.client.Client clientRequest = ClientBuilder.newClient();
String request = null;
try {
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/ScopeChecker.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/ScopeChecker.java
index ffb38ed8a06..179de51ec86 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/ScopeChecker.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/ScopeChecker.java
@@ -15,9 +15,9 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AbstractAuthorizationGrant.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AbstractAuthorizationGrant.java
index ea9dc70c131..e445c56f697 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AbstractAuthorizationGrant.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AbstractAuthorizationGrant.java
@@ -21,7 +21,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrant.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrant.java
index 15d68a237ed..13f2be3bc10 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrant.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrant.java
@@ -40,7 +40,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
import java.util.List;
import java.util.function.Supplier;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrantList.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrantList.java
index 8cbbe0bb98d..84e46e75f01 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrantList.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrantList.java
@@ -24,9 +24,9 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CIBAGrant.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CIBAGrant.java
index 648c0228849..e6c182e3d89 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CIBAGrant.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CIBAGrant.java
@@ -9,7 +9,7 @@
import io.jans.as.model.common.GrantType;
import io.jans.service.CacheService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* An extension grant with the grant type value: urn:openid:params:grant-type:ciba
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CacheGrant.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CacheGrant.java
index 81ce2280c94..66696a51fcc 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CacheGrant.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CacheGrant.java
@@ -11,7 +11,7 @@
import io.jans.as.model.configuration.AppConfiguration;
import org.apache.commons.lang.StringUtils;
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
import java.io.Serializable;
import java.util.Date;
import java.util.Set;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/DeviceCodeGrant.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/DeviceCodeGrant.java
index 08a5d4b1a1d..12b33884fe1 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/DeviceCodeGrant.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/DeviceCodeGrant.java
@@ -11,7 +11,7 @@
import io.jans.service.CacheService;
import org.apache.commons.lang.StringUtils;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* An extension grant with the grant type value: urn:ietf:params:oauth:grant-type:device_code
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/ExecutionContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/ExecutionContext.java
index bafcf750e52..146966cb056 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/ExecutionContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/ExecutionContext.java
@@ -15,9 +15,9 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.Response;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/SessionId.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/SessionId.java
index d694cabb3bc..f496d9edaf2 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/SessionId.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/SessionId.java
@@ -18,8 +18,8 @@
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;
-import javax.inject.Named;
-import javax.persistence.Transient;
+import jakarta.inject.Named;
+import jakarta.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/SessionIdAccessMap.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/SessionIdAccessMap.java
index d69d119679f..cd9344acbbe 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/SessionIdAccessMap.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/SessionIdAccessMap.java
@@ -8,9 +8,9 @@
import com.google.common.collect.Sets;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/config/ConfigurationFactory.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/config/ConfigurationFactory.java
index 1f84577883d..8859ea61ee9 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/config/ConfigurationFactory.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/config/ConfigurationFactory.java
@@ -41,16 +41,16 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRegistration;
import java.io.File;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/registration/RegisterParamsValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/registration/RegisterParamsValidator.java
index 3f62425e3f7..caddad88ab3 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/registration/RegisterParamsValidator.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/registration/RegisterParamsValidator.java
@@ -24,13 +24,13 @@
import org.json.JSONArray;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashSet;
@@ -304,7 +304,7 @@ public boolean validateRedirectUris(List grantTypes, List getSectorRedirectUris(String sectorIdentiferUri) throws Exce
return sectorRedirectUris;
}
- javax.ws.rs.client.Client clientRequest = ClientBuilder.newClient();
+ jakarta.ws.rs.client.Client clientRequest = ClientBuilder.newClient();
String entity = null;
try {
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/RequestParameterService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/RequestParameterService.java
index ac1004a9332..2c8dfcd51f5 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/RequestParameterService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/RequestParameterService.java
@@ -19,9 +19,9 @@
import org.json.JSONObject;
import javax.annotation.Nonnull;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.*;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ResteasyInitializer.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ResteasyInitializer.java
index d3a7da16145..dff64a7b470 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ResteasyInitializer.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ResteasyInitializer.java
@@ -31,8 +31,8 @@
import io.jans.as.server.userinfo.ws.rs.UserInfoRestWebServiceImpl;
import io.jans.as.server.ws.rs.stat.StatWS;
-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.HashSet;
import java.util.Set;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ScopeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ScopeService.java
index f4ecfbff024..27e1dd74ab2 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ScopeService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ScopeService.java
@@ -26,8 +26,8 @@
import org.json.JSONArray;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SectorIdentifierService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SectorIdentifierService.java
index bb70234b667..d3ba8e85d2a 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SectorIdentifierService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SectorIdentifierService.java
@@ -21,9 +21,9 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.net.URI;
import java.util.UUID;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SessionIdService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SessionIdService.java
index 07df635cfb4..354996b132f 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SessionIdService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SessionIdService.java
@@ -52,13 +52,13 @@
import org.json.JSONException;
import org.slf4j.Logger;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.NoSuchAlgorithmException;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SpontaneousScopeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SpontaneousScopeService.java
index 5806b5118c3..9939f8b8ed9 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SpontaneousScopeService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SpontaneousScopeService.java
@@ -16,9 +16,9 @@
import org.python.google.common.collect.Sets;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SystemResteasyInitializer.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SystemResteasyInitializer.java
index 3ef61522f3e..329ed53d485 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SystemResteasyInitializer.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SystemResteasyInitializer.java
@@ -8,8 +8,8 @@
import io.jans.as.server.ws.rs.controller.HealthCheckController;
-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.HashSet;
import java.util.Set;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserGroupService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserGroupService.java
index fc04fc98b6d..ca6b4aafcc3 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserGroupService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserGroupService.java
@@ -13,9 +13,9 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Arrays;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserService.java
index 4f539ecf995..a12f57c40ca 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserService.java
@@ -20,8 +20,8 @@
import io.jans.util.StringHelper;
import org.apache.commons.lang.StringUtils;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import java.util.List;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/WebConfigurationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/WebConfigurationService.java
index 12b1b13789f..df90db21517 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/WebConfigurationService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/WebConfigurationService.java
@@ -8,11 +8,11 @@
import io.jans.as.model.configuration.AppConfiguration;
import io.jans.util.StringHelper;
-import javax.enterprise.context.ApplicationScoped;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.ServletContext;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.ServletContext;
/**
* OxAuthConfigurationService
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/cdi/event/ReloadAuthScript.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/cdi/event/ReloadAuthScript.java
index 0156db20ebd..7ef66994aa1 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/cdi/event/ReloadAuthScript.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/cdi/event/ReloadAuthScript.java
@@ -6,8 +6,8 @@
package io.jans.as.server.service.cdi.event;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaEncryptionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaEncryptionService.java
index ae7b60be19b..ae226509027 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaEncryptionService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaEncryptionService.java
@@ -12,9 +12,9 @@
import io.jans.util.security.StringEncrypter.EncryptionException;
import org.slf4j.Logger;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Properties;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestService.java
index d393a782b65..d5111ef53dd 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestService.java
@@ -19,9 +19,9 @@
import org.apache.commons.lang.time.DateUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Date;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestsProcessorJob.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestsProcessorJob.java
index 68b4994b12c..e898a1d322c 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestsProcessorJob.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestsProcessorJob.java
@@ -22,12 +22,12 @@
import io.jans.service.timer.schedule.TimerSchedule;
import org.slf4j.Logger;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/custom/CustomScriptService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/custom/CustomScriptService.java
index 3e094679ce1..19990f52cd8 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/custom/CustomScriptService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/custom/CustomScriptService.java
@@ -10,11 +10,11 @@
import io.jans.as.model.util.Base64Util;
import io.jans.service.custom.script.AbstractCustomScriptService;
-import javax.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
-import javax.inject.Inject;
-import javax.interceptor.Interceptor;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.inject.Inject;
+import jakarta.interceptor.Interceptor;
import java.nio.charset.StandardCharsets;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/expiration/ExpirationNotificatorTimer.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/expiration/ExpirationNotificatorTimer.java
index 8f3afbe1cbf..f7bae930b61 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/expiration/ExpirationNotificatorTimer.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/expiration/ExpirationNotificatorTimer.java
@@ -24,11 +24,11 @@
import net.jodah.expiringmap.ExpiringMap;
import org.slf4j.Logger;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalApplicationSessionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalApplicationSessionService.java
index a02e93ae6c5..5d130b86119 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalApplicationSessionService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalApplicationSessionService.java
@@ -16,10 +16,10 @@
import io.jans.service.custom.script.ExternalScriptService;
import org.json.JSONArray;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Map;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalAuthenticationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalAuthenticationService.java
index 81139a0a8fb..d82dc6d9f48 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalAuthenticationService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalAuthenticationService.java
@@ -26,10 +26,10 @@
import io.jans.util.StringHelper;
import org.apache.commons.lang.StringUtils;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.*;
import java.util.Map.Entry;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalCibaEndUserNotificationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalCibaEndUserNotificationService.java
index d0cc5248cef..e3854d08c3e 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalCibaEndUserNotificationService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalCibaEndUserNotificationService.java
@@ -12,9 +12,9 @@
import io.jans.model.custom.script.type.ciba.EndUserNotificationType;
import io.jans.service.custom.script.ExternalScriptService;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
/**
* @author Milton BO
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalConsentGatheringService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalConsentGatheringService.java
index 376b3b73d0c..54316cf4e7c 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalConsentGatheringService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalConsentGatheringService.java
@@ -14,10 +14,10 @@
import io.jans.service.custom.script.ExternalScriptService;
import io.jans.util.StringHelper;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDiscoveryService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDiscoveryService.java
index 2b3756ca54e..f0c22ce1954 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDiscoveryService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDiscoveryService.java
@@ -7,7 +7,7 @@
import io.jans.service.custom.script.ExternalScriptService;
import org.json.JSONObject;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
/**
* @author Yuriy Zabrovarnyy
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDynamicClientRegistrationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDynamicClientRegistrationService.java
index f01bf78e8f2..06e872f8377 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDynamicClientRegistrationService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDynamicClientRegistrationService.java
@@ -20,12 +20,12 @@
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
import java.security.cert.X509Certificate;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDynamicScopeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDynamicScopeService.java
index ed417a38268..594fc706953 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDynamicScopeService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalDynamicScopeService.java
@@ -15,9 +15,9 @@
import io.jans.model.custom.script.type.scope.DynamicScopeType;
import io.jans.service.custom.script.ExternalScriptService;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalEndSessionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalEndSessionService.java
index fa4da338229..c0c82f038e4 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalEndSessionService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalEndSessionService.java
@@ -13,9 +13,9 @@
import io.jans.service.custom.script.ExternalScriptService;
import org.apache.commons.lang.StringUtils;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
/**
* @author Yuriy Zabrovarnyy
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalIntrospectionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalIntrospectionService.java
index d6d40b3b0e4..46644dc3bb2 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalIntrospectionService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalIntrospectionService.java
@@ -16,10 +16,10 @@
import org.jetbrains.annotations.NotNull;
import org.json.JSONObject;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.List;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalPostAuthnService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalPostAuthnService.java
index 1185247ee94..defbdd5df75 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalPostAuthnService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalPostAuthnService.java
@@ -13,9 +13,9 @@
import io.jans.model.custom.script.type.postauthn.PostAuthnType;
import io.jans.service.custom.script.ExternalScriptService;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import java.util.List;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalResourceOwnerPasswordCredentialsService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalResourceOwnerPasswordCredentialsService.java
index c27268d9e9b..d3fae87e6b4 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalResourceOwnerPasswordCredentialsService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalResourceOwnerPasswordCredentialsService.java
@@ -13,9 +13,9 @@
import io.jans.model.custom.script.type.owner.ResourceOwnerPasswordCredentialsType;
import io.jans.service.custom.script.ExternalScriptService;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import java.util.List;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalRevokeTokenService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalRevokeTokenService.java
index 8f981edb4dc..245cf8a9fc8 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalRevokeTokenService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalRevokeTokenService.java
@@ -6,9 +6,9 @@
import io.jans.model.custom.script.type.revoke.RevokeTokenType;
import io.jans.service.custom.script.ExternalScriptService;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
/**
* @author Yuriy Zabrovarnyy
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalSpontaneousScopeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalSpontaneousScopeService.java
index 4bf5360a5cc..0834d5c01ce 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalSpontaneousScopeService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalSpontaneousScopeService.java
@@ -14,9 +14,9 @@
import io.jans.model.custom.script.type.spontaneous.SpontaneousScopeType;
import io.jans.service.custom.script.ExternalScriptService;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import java.util.List;
import java.util.Set;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaClaimsGatheringService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaClaimsGatheringService.java
index 3dce538b892..a9b2be454d9 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaClaimsGatheringService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaClaimsGatheringService.java
@@ -15,10 +15,10 @@
import io.jans.service.custom.script.ExternalScriptService;
import io.jans.util.StringHelper;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaRptClaimsService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaRptClaimsService.java
index a293054c4e7..89141882ee4 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaRptClaimsService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaRptClaimsService.java
@@ -13,9 +13,9 @@
import io.jans.service.custom.script.ExternalScriptService;
import org.json.JSONObject;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
import java.util.List;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaRptPolicyService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaRptPolicyService.java
index d90335704ad..daa5f825b90 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaRptPolicyService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUmaRptPolicyService.java
@@ -17,10 +17,10 @@
import io.jans.util.StringHelper;
import org.apache.commons.io.FileUtils;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUpdateTokenService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUpdateTokenService.java
index 6d4bbbf3da2..19c8b146a18 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUpdateTokenService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalUpdateTokenService.java
@@ -17,7 +17,7 @@
import io.jans.service.custom.script.ExternalScriptService;
import org.jetbrains.annotations.NotNull;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
import java.util.List;
import java.util.function.Function;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ConsentGatheringContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ConsentGatheringContext.java
index 9ff6c264df3..30103c0f27e 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ConsentGatheringContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ConsentGatheringContext.java
@@ -15,8 +15,8 @@
import io.jans.jsf2.service.FacesService;
import io.jans.model.SimpleCustomProperty;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/DynamicClientRegistrationContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/DynamicClientRegistrationContext.java
index e11d684ab8f..4178023379b 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/DynamicClientRegistrationContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/DynamicClientRegistrationContext.java
@@ -23,8 +23,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.Response;
import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/EndSessionContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/EndSessionContext.java
index c2a9760a68d..4428ce98a5f 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/EndSessionContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/EndSessionContext.java
@@ -10,7 +10,7 @@
import io.jans.as.server.model.common.SessionId;
import io.jans.model.custom.script.conf.CustomScriptConfiguration;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Set;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalIntrospectionContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalIntrospectionContext.java
index ae0cddea6d4..d5dd298c91d 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalIntrospectionContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalIntrospectionContext.java
@@ -13,8 +13,8 @@
import io.jans.as.server.model.common.AuthorizationGrant;
import io.jans.model.custom.script.conf.CustomScriptConfiguration;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Yuriy Zabrovarnyy
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalPostAuthnContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalPostAuthnContext.java
index 981c2d85229..5ead1f26a33 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalPostAuthnContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalPostAuthnContext.java
@@ -10,8 +10,8 @@
import io.jans.as.server.model.common.SessionId;
import io.jans.model.custom.script.conf.CustomScriptConfiguration;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Yuriy Zabrovarnyy
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalScriptContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalScriptContext.java
index bb5ad5310f4..362a1a209e0 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalScriptContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalScriptContext.java
@@ -15,11 +15,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
/**
* Holds object required in custom scripts
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalUmaRptClaimsContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalUmaRptClaimsContext.java
index e4ce875c0e2..81973641db4 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalUmaRptClaimsContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalUmaRptClaimsContext.java
@@ -10,8 +10,8 @@
import io.jans.as.server.model.common.ExecutionContext;
import io.jans.model.custom.script.conf.CustomScriptConfiguration;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Yuriy Zabrovarnyy
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalUpdateTokenContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalUpdateTokenContext.java
index 91754f44ede..ca2644d1455 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalUpdateTokenContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/context/ExternalUpdateTokenContext.java
@@ -15,7 +15,7 @@
import io.jans.model.custom.script.conf.CustomScriptConfiguration;
import org.jetbrains.annotations.Nullable;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Yuriy Movchan
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/internal/InternalDefaultPersonAuthenticationType.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/internal/InternalDefaultPersonAuthenticationType.java
index 4fde5d869d0..9c5f743a458 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/internal/InternalDefaultPersonAuthenticationType.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/internal/InternalDefaultPersonAuthenticationType.java
@@ -11,9 +11,9 @@
import io.jans.model.custom.script.type.auth.DummyPersonAuthenticationType;
import io.jans.model.security.Credentials;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Map;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/session/SessionEvent.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/session/SessionEvent.java
index 295b3bb3451..0bbcde595a5 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/session/SessionEvent.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/session/SessionEvent.java
@@ -9,8 +9,8 @@
import io.jans.as.server.model.common.SessionId;
import io.jans.model.custom.script.conf.CustomScriptConfiguration;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Yuriy Zabrovarnyy
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/logger/LoggerService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/logger/LoggerService.java
index 63d8660796b..3195bce59fb 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/logger/LoggerService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/logger/LoggerService.java
@@ -8,9 +8,9 @@
import io.jans.as.model.configuration.AppConfiguration;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import static org.apache.commons.lang3.BooleanUtils.isTrue;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/net/HttpService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/net/HttpService.java
index a17c904059a..9a5a342c65f 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/net/HttpService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/net/HttpService.java
@@ -32,11 +32,11 @@
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/push/sns/PushSnsService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/push/sns/PushSnsService.java
index 6937fa38768..cf4d5e32f19 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/push/sns/PushSnsService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/push/sns/PushSnsService.java
@@ -22,9 +22,9 @@
import io.jans.as.server.util.ServerUtil;
import io.jans.orm.PersistenceEntryManager;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatResponseService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatResponseService.java
index 6ccd180b87a..e13b99c1f12 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatResponseService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatResponseService.java
@@ -10,10 +10,10 @@
import net.agkn.hll.HLL;
import org.slf4j.Logger;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Base64;
import java.util.List;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatService.java
index e2ec28c3b5e..aa727412307 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatService.java
@@ -14,11 +14,11 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.annotation.PostConstruct;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.text.SimpleDateFormat;
import java.util.Base64;
import java.util.Date;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatTimer.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatTimer.java
index 0e4e4c02799..2f5696e6296 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatTimer.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatTimer.java
@@ -9,12 +9,12 @@
import io.jans.service.timer.schedule.TimerSchedule;
import org.slf4j.Logger;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.concurrent.atomic.AtomicBoolean;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/status/ldap/LdapStatusTimer.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/status/ldap/LdapStatusTimer.java
index c6f07216772..755a8fd9ca2 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/status/ldap/LdapStatusTimer.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/status/ldap/LdapStatusTimer.java
@@ -18,12 +18,12 @@
import io.jans.service.timer.schedule.TimerSchedule;
import org.slf4j.Logger;
-import javax.ejb.DependsOn;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.DependsOn;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/TokenService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/TokenService.java
index 867b2a36cba..83b2f5d04b3 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/TokenService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/TokenService.java
@@ -13,8 +13,8 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
/**
* Token specific service methods
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountAccessConsentServlet.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountAccessConsentServlet.java
index 36504ea1195..a289fb540a2 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountAccessConsentServlet.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountAccessConsentServlet.java
@@ -8,13 +8,13 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+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;
import java.sql.Timestamp;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountsServlet.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountsServlet.java
index d1ecd8459e2..77d61137710 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountsServlet.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountsServlet.java
@@ -14,12 +14,12 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-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.inject.Inject;
+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;
import java.security.PublicKey;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/BcFirebaseMessagingSwServlet.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/BcFirebaseMessagingSwServlet.java
index 54ccac42638..9f20b7120e7 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/BcFirebaseMessagingSwServlet.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/BcFirebaseMessagingSwServlet.java
@@ -11,12 +11,12 @@
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
-import javax.inject.Inject;
-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.inject.Inject;
+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.InputStream;
import java.io.OutputStream;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FapiOpenIdConfiguration.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FapiOpenIdConfiguration.java
index 9210bb7d202..1dd59565aae 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FapiOpenIdConfiguration.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FapiOpenIdConfiguration.java
@@ -34,12 +34,12 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-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.inject.Inject;
+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;
import java.security.PublicKey;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FaviconServlet.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FaviconServlet.java
index df50feb1e35..657c9ee3b2b 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FaviconServlet.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FaviconServlet.java
@@ -13,12 +13,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.inject.Inject;
-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.inject.Inject;
+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.File;
import java.io.FileInputStream;
import java.io.IOException;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/LogoServlet.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/LogoServlet.java
index f021c9d916e..57dd21a2354 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/LogoServlet.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/LogoServlet.java
@@ -13,11 +13,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.inject.Inject;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/OpenIdConfiguration.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/OpenIdConfiguration.java
index 1110240e662..64b01c8fd60 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/OpenIdConfiguration.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/OpenIdConfiguration.java
@@ -29,11 +29,11 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+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;
import java.util.Arrays;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/SectorIdentifier.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/SectorIdentifier.java
index 88162e11c86..2beed5a3ee5 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/SectorIdentifier.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/SectorIdentifier.java
@@ -10,12 +10,12 @@
import org.json.JSONArray;
import org.slf4j.Logger;
-import javax.inject.Inject;
-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.inject.Inject;
+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/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/WebFinger.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/WebFinger.java
index 5e932ac798d..ba96e6f0605 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/WebFinger.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/WebFinger.java
@@ -13,12 +13,12 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-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.inject.Inject;
+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;
@@ -89,7 +89,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
*
* @param request servlet request
* @param response servlet response
- * @throws javax.servlet.ServletException if a servlet-specific error occurs
+ * @throws jakarta.servlet.ServletException if a servlet-specific error occurs
* @throws java.io.IOException if an I/O error occurs
*/
@Override
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/CheckSessionStatusRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/CheckSessionStatusRestWebServiceImpl.java
index bc0ec085b37..e7e49c1ad86 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/CheckSessionStatusRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/CheckSessionStatusRestWebServiceImpl.java
@@ -16,16 +16,16 @@
import io.jans.util.StringHelper;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-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 javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+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 jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
import java.io.IOException;
import java.util.Date;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebService.java
index e64ca4d3c05..f13a62b3103 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebService.java
@@ -8,16 +8,16 @@
import io.jans.as.model.session.EndSessionRequestParam;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-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.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+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.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
/**
* @author Javier Rojas Blum
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java
index f34f9820f69..1a5a7a1ad5f 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java
@@ -45,15 +45,15 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Path;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.UriBuilder;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java
index 873f2cf2ffe..3b829dec5f7 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java
@@ -12,11 +12,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.client.ClientBuilder;
-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.ClientBuilder;
+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.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -38,7 +38,7 @@ public static ExecutorService getExecutorService() {
}
public static void callRpWithBackchannelUri(final String backchannelLogoutUri, String logoutToken) {
- javax.ws.rs.client.Client client = ((ResteasyClientBuilder) ClientBuilder.newBuilder()).httpEngine(ClientFactory.instance().createEngine(true)).build();
+ jakarta.ws.rs.client.Client client = ((ResteasyClientBuilder) ClientBuilder.newBuilder()).httpEngine(ClientFactory.instance().createEngine(true)).build();
WebTarget target = client.target(backchannelLogoutUri);
log.debug("Calling RP with backchannel, backchannel_logout_uri: {}", backchannelLogoutUri);
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java
index 7ad5c014eea..2e83fd46283 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java
@@ -19,9 +19,9 @@
import org.msgpack.core.Preconditions;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Calendar;
import java.util.Date;
import java.util.UUID;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/SessionRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/SessionRestWebService.java
index ac8f0cb976b..1cf2d8e3059 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/SessionRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/SessionRestWebService.java
@@ -21,18 +21,18 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
import java.util.ArrayList;
import java.util.Date;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebService.java
index 91648caabf9..c00b429f777 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebService.java
@@ -6,16 +6,16 @@
package io.jans.as.server.token.ws.rs;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-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.SecurityContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+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.SecurityContext;
/**
* Provides interface for token REST web services
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceImpl.java
index 4d39d5bf919..2b06fb7afc0 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceImpl.java
@@ -74,15 +74,15 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Path;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.SecurityContext;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.Arrays;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaAuthorizationContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaAuthorizationContext.java
index 2479e246250..1c42d1ac076 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaAuthorizationContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaAuthorizationContext.java
@@ -21,7 +21,7 @@
import io.jans.as.server.uma.service.UmaSessionService;
import io.jans.model.SimpleCustomProperty;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaAuthorizationContextBuilder.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaAuthorizationContextBuilder.java
index d7b91250071..f9f1ec89efe 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaAuthorizationContextBuilder.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaAuthorizationContextBuilder.java
@@ -16,7 +16,7 @@
import io.jans.as.server.uma.service.UmaSessionService;
import io.jans.model.custom.script.conf.CustomScriptConfiguration;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaGatherContext.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaGatherContext.java
index 7f001e272e9..799236c9a85 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaGatherContext.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaGatherContext.java
@@ -21,7 +21,7 @@
import io.jans.as.server.uma.ws.rs.UmaMetadataWS;
import io.jans.model.SimpleCustomProperty;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaWebException.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaWebException.java
index 7d546110fa1..052e02ae7c8 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaWebException.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaWebException.java
@@ -13,13 +13,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-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;
import java.net.URLEncoder;
-import static javax.ws.rs.core.Response.Status.FOUND;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static jakarta.ws.rs.core.Response.Status.FOUND;
+import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
/**
* @author yuriyz on 06/06/2017.
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaExpressionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaExpressionService.java
index bbd44206fd5..7e951b94b08 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaExpressionService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaExpressionService.java
@@ -22,10 +22,10 @@
import io.jans.util.StringHelper;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaGatherer.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaGatherer.java
index 398db497508..5b21142a441 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaGatherer.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaGatherer.java
@@ -19,14 +19,14 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaNeedsInfoService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaNeedsInfoService.java
index 780d5d2b3c9..630041bff48 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaNeedsInfoService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaNeedsInfoService.java
@@ -24,12 +24,12 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPctService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPctService.java
index a5ec07de731..a290fc5a5c3 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPctService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPctService.java
@@ -18,8 +18,8 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.UUID;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPermissionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPermissionService.java
index d46ea2275b7..2eb792d9c84 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPermissionService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPermissionService.java
@@ -18,9 +18,9 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaResourceService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaResourceService.java
index cacd1992986..b96d2683344 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaResourceService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaResourceService.java
@@ -20,10 +20,10 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.Response;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaRptService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaRptService.java
index c001d9ea372..ecc32c8075d 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaRptService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaRptService.java
@@ -37,8 +37,8 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaScopeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaScopeService.java
index 6c1c5d3556c..a4f273d3ebf 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaScopeService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaScopeService.java
@@ -20,10 +20,10 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaSessionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaSessionService.java
index 9264abee87d..2ad6a5ee4d3 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaSessionService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaSessionService.java
@@ -17,11 +17,11 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaTokenService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaTokenService.java
index 23b4a28d38d..7a554c90b76 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaTokenService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaTokenService.java
@@ -24,13 +24,13 @@
import io.jans.as.server.util.ServerUtil;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaValidationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaValidationService.java
index 9da208c1e89..083ca294979 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaValidationService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaValidationService.java
@@ -44,10 +44,10 @@
import org.python.google.common.collect.Iterables;
import org.slf4j.Logger;
-import javax.ejb.Stateless;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.core.Response;
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.Response;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
@@ -70,8 +70,8 @@
import static io.jans.as.model.uma.UmaErrorResponseType.INVALID_TICKET;
import static io.jans.as.model.uma.UmaErrorResponseType.UNAUTHORIZED_CLIENT;
import static io.jans.as.model.util.Util.escapeLog;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
import static org.apache.commons.lang3.BooleanUtils.isTrue;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaGatheringWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaGatheringWS.java
index aa6567b0b93..58453e09970 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaGatheringWS.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaGatheringWS.java
@@ -25,19 +25,19 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-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.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+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.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
import java.net.URI;
import java.util.Arrays;
import java.util.HashMap;
@@ -46,8 +46,8 @@
import static io.jans.as.model.uma.UmaErrorResponseType.INVALID_CLAIMS_GATHERING_SCRIPT_NAME;
import static io.jans.as.model.uma.UmaErrorResponseType.INVALID_SESSION;
import static io.jans.as.model.util.Util.escapeLog;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.FOUND;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.FOUND;
/**
* Claims-Gathering Endpoint.
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaMetadataWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaMetadataWS.java
index 2a9358c1909..dec3c5c8dce 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaMetadataWS.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaMetadataWS.java
@@ -17,11 +17,11 @@
import io.jans.as.server.util.ServerUtil;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
/**
* The endpoint at which the requester can obtain UMA2 metadata.
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaPermissionRegistrationWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaPermissionRegistrationWS.java
index f5d79ad4479..b93dca38960 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaPermissionRegistrationWS.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaPermissionRegistrationWS.java
@@ -22,17 +22,17 @@
import io.jans.as.server.util.ServerUtil;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.io.IOException;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaResourceRegistrationWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaResourceRegistrationWS.java
index 1b5ed2ab4f6..22a9534f3db 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaResourceRegistrationWS.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaResourceRegistrationWS.java
@@ -18,23 +18,23 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HEAD;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.OPTIONS;
-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.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HEAD;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.OPTIONS;
+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.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Calendar;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaRptIntrospectionWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaRptIntrospectionWS.java
index 8d2ef365529..7f6f3244ed3 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaRptIntrospectionWS.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaRptIntrospectionWS.java
@@ -26,21 +26,21 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.List;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeIconWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeIconWS.java
index 49e2abc0830..4add845c244 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeIconWS.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeIconWS.java
@@ -15,12 +15,12 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.inject.Inject;
-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.Response;
+import jakarta.inject.Inject;
+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.Response;
import java.net.URI;
/**
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeWS.java
index 1f29caaf0af..4e64006dd38 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeWS.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeWS.java
@@ -17,12 +17,12 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.inject.Inject;
-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.Response;
+import jakarta.inject.Inject;
+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.Response;
/**
* @author Yuriy Zabrovarnyy
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/userinfo/ws/rs/UserInfoRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/userinfo/ws/rs/UserInfoRestWebService.java
index 23c4e3dd16a..a5f3e8e256e 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/userinfo/ws/rs/UserInfoRestWebService.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/userinfo/ws/rs/UserInfoRestWebService.java
@@ -6,18 +6,18 @@
package io.jans.as.server.userinfo.ws.rs;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-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.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+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.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
/**
* Provides interface for User Info REST web services
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/userinfo/ws/rs/UserInfoRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/userinfo/ws/rs/UserInfoRestWebServiceImpl.java
index 83933e9c09d..75c3ca676c5 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/userinfo/ws/rs/UserInfoRestWebServiceImpl.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/userinfo/ws/rs/UserInfoRestWebServiceImpl.java
@@ -60,12 +60,12 @@
import org.json.JSONObject;
import org.slf4j.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
import java.nio.charset.StandardCharsets;
import java.security.PublicKey;
import java.text.ParseException;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/util/PasswordValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/util/PasswordValidator.java
index 9c644c9ee49..5a76e103033 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/util/PasswordValidator.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/util/PasswordValidator.java
@@ -11,20 +11,20 @@
import io.jans.service.AttributeService;
import io.jans.service.cdi.util.CdiUtil;
-import javax.enterprise.context.ApplicationScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.FacesValidator;
-import javax.faces.validator.ValidatorException;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.component.UIInput;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.FacesValidator;
+import jakarta.faces.validator.ValidatorException;
+import jakarta.inject.Inject;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ApplicationScoped
@FacesValidator(value = "gluuPasswordValidator", managed = true)
-public class PasswordValidator implements javax.faces.validator.Validator {
+public class PasswordValidator implements jakarta.faces.validator.Validator {
private static final String USER_PASSWORD = "userPassword";
private String newPassword;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/util/RedirectUtil.java b/jans-auth-server/server/src/main/java/io/jans/as/server/util/RedirectUtil.java
index 9b0dd56c294..0f99b3f88be 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/util/RedirectUtil.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/util/RedirectUtil.java
@@ -15,12 +15,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.CacheControl;
+import jakarta.ws.rs.core.GenericEntity;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
import java.net.MalformedURLException;
import java.net.URI;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/util/ServerUtil.java b/jans-auth-server/server/src/main/java/io/jans/as/server/util/ServerUtil.java
index 8526f42e256..e685027be3d 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/util/ServerUtil.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/util/ServerUtil.java
@@ -27,10 +27,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.CacheControl;
+import jakarta.faces.context.ExternalContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.CacheControl;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ws/rs/controller/HealthCheckController.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ws/rs/controller/HealthCheckController.java
index 102e4b9abbe..e5d9010e0d1 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ws/rs/controller/HealthCheckController.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ws/rs/controller/HealthCheckController.java
@@ -10,13 +10,13 @@
import io.jans.as.model.error.ErrorResponseFactory;
import io.jans.orm.PersistenceEntryManager;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-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.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+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;
/**
* Health check controller
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ws/rs/stat/StatWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ws/rs/stat/StatWS.java
index 3579915a988..30b9aa7e251 100644
--- a/jans-auth-server/server/src/main/java/io/jans/as/server/ws/rs/stat/StatWS.java
+++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ws/rs/stat/StatWS.java
@@ -17,18 +17,18 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
diff --git a/jans-auth-server/server/src/main/resources/META-INF/beans.xml b/jans-auth-server/server/src/main/resources/META-INF/beans.xml
index 7c00f456fee..18df4ddcb30 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/beans.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/beans.xml
@@ -1,7 +1,6 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/cas2.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/cas2.navigation.xml
index 035a7034b91..0a5b99d7fa2 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/cas2.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/cas2.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/cert.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/cert.navigation.xml
index 0d6d38e8e1b..a0b1bd3de9a 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/cert.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/cert.navigation.xml
@@ -1,8 +1,9 @@
-
-
+
+
/auth/cert/cert-login.xhtml
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/duo.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/duo.navigation.xml
index 1024fba615f..16ab13c95bc 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/duo.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/duo.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/gplus.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/gplus.navigation.xml
index 08609e710d7..8a79cd89c96 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/gplus.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/gplus.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/otp.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/otp.navigation.xml
index 6e5df22da7c..33835c377ed 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/otp.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/otp.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/oxpush.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/oxpush.navigation.xml
index 51e20c0bc89..4c97de33dc7 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/oxpush.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/oxpush.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/passport.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/passport.navigation.xml
index a12902b02ad..f4e2efebc8d 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/passport.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/passport.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/saml.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/saml.navigation.xml
index d38d9f46676..4b886e1e322 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/saml.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/saml.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/super-gluu.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/super-gluu.navigation.xml
index d207d5d8748..4304a5810d0 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/super-gluu.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/super-gluu.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/u2f.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/u2f.navigation.xml
index 140ff23eedf..eb17a2e1a2a 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/u2f.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/u2f.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/uaf.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/uaf.navigation.xml
index b60f6660cc7..fb7c41facc4 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/uaf.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/uaf.navigation.xml
@@ -1,7 +1,8 @@
-
+
diff --git a/jans-auth-server/server/src/main/resources/META-INF/navigation/uma2.sample.navigation.xml b/jans-auth-server/server/src/main/resources/META-INF/navigation/uma2.sample.navigation.xml
index 79298ab0247..0c4a870a190 100644
--- a/jans-auth-server/server/src/main/resources/META-INF/navigation/uma2.sample.navigation.xml
+++ b/jans-auth-server/server/src/main/resources/META-INF/navigation/uma2.sample.navigation.xml
@@ -1,7 +1,8 @@
-
+
/uma2/sample/country.xhtml
diff --git a/jans-auth-server/server/src/main/resources/META-INF/services/javax.faces.application.ApplicationConfigurationPopulator b/jans-auth-server/server/src/main/resources/META-INF/services/jakarta.faces.application.ApplicationConfigurationPopulator
similarity index 100%
rename from jans-auth-server/server/src/main/resources/META-INF/services/javax.faces.application.ApplicationConfigurationPopulator
rename to jans-auth-server/server/src/main/resources/META-INF/services/jakarta.faces.application.ApplicationConfigurationPopulator
diff --git a/jans-auth-server/server/src/main/resources/faces-config.xml b/jans-auth-server/server/src/main/resources/faces-config.xml
index e052d20a018..fc36eec473a 100644
--- a/jans-auth-server/server/src/main/resources/faces-config.xml
+++ b/jans-auth-server/server/src/main/resources/faces-config.xml
@@ -1,7 +1,6 @@
-
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_3_0.xsd"
+ version="2.3">
+
\ No newline at end of file
diff --git a/jans-auth-server/server/src/main/webapp-jetty/WEB-INF/jetty-env.xml b/jans-auth-server/server/src/main/webapp-jetty/WEB-INF/jetty-env.xml
index 4666928c71b..47e2a829093 100644
--- a/jans-auth-server/server/src/main/webapp-jetty/WEB-INF/jetty-env.xml
+++ b/jans-auth-server/server/src/main/webapp-jetty/WEB-INF/jetty-env.xml
@@ -1,18 +1,18 @@
-
+
-
+
BeanManager
- javax.enterprise.inject.spi.BeanManager
+ jakarta.enterprise.inject.spi.BeanManager
org.jboss.weld.resources.ManagerObjectFactory
diff --git a/jans-auth-server/server/src/main/webapp-jetty/WEB-INF/jetty-web.xml b/jans-auth-server/server/src/main/webapp-jetty/WEB-INF/jetty-web.xml
index 288c8653e4f..e669116da12 100644
--- a/jans-auth-server/server/src/main/webapp-jetty/WEB-INF/jetty-web.xml
+++ b/jans-auth-server/server/src/main/webapp-jetty/WEB-INF/jetty-web.xml
@@ -4,36 +4,40 @@
-
+