feat(jans): jetty 11 integration

docker-jans-auth-server/Dockerfile

@@ -16,7 +16,7 @@ RUN apk update \
 # Jetty
 # =====
 
-ARG JETTY_VERSION=10.0.6
+ARG JETTY_VERSION=11.0.8
 ARG JETTY_HOME=/opt/jetty
 ARG JETTY_BASE=/opt/jans/jetty
 ARG JETTY_USER_HOME_LIB=/home/jetty/lib

docker-jans-config-api/Dockerfile

@@ -16,7 +16,7 @@ RUN apk update \
 # Jetty
 # =====
 
-ARG JETTY_VERSION=10.0.6
+ARG JETTY_VERSION=11.0.8
 ARG JETTY_HOME=/opt/jetty
 ARG JETTY_BASE=/opt/jans/jetty
 ARG JETTY_USER_HOME_LIB=/home/jetty/lib

docker-jans-fido2/Dockerfile

@@ -16,7 +16,7 @@ RUN apk update \
 # Jetty
 # =====
 
-ARG JETTY_VERSION=10.0.6
+ARG JETTY_VERSION=11.0.8
 ARG JETTY_HOME=/opt/jetty
 ARG JETTY_BASE=/opt/jans/jetty
 ARG JETTY_USER_HOME_LIB=/home/jetty/lib

docker-jans-scim/Dockerfile

@@ -16,7 +16,7 @@ RUN apk update \
 # Jetty
 # =====
 
-ARG JETTY_VERSION=10.0.6
+ARG JETTY_VERSION=11.0.8
 ARG JETTY_HOME=/opt/jetty
 ARG JETTY_BASE=/opt/jans/jetty
 ARG JETTY_USER_HOME_LIB=/home/jetty/lib

jans-auth-server/client/pom.xml

@@ -210,8 +210,8 @@
 		</dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
 

jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java

@@ -20,7 +20,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;

jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizeClient.java

@@ -15,11 +15,11 @@
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.core.MediaType;
 import java.util.ArrayList;
 import java.util.List;
 

jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationClient.java

@@ -13,9 +13,9 @@
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
 
 import static io.jans.as.model.ciba.BackchannelAuthenticationResponseParam.AUTH_REQ_ID;
 import static io.jans.as.model.ciba.BackchannelAuthenticationResponseParam.EXPIRES_IN;

jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationRequest.java

@@ -11,7 +11,7 @@
 import io.jans.as.model.util.QueryBuilder;
 import io.jans.as.model.util.Util;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 import java.util.List;
 
 /**

jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationResponse.java

@@ -12,7 +12,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import static io.jans.as.model.ciba.BackchannelAuthenticationResponseParam.AUTH_REQ_ID;
 import static io.jans.as.model.ciba.BackchannelAuthenticationResponseParam.EXPIRES_IN;

jans-auth-server/client/src/main/java/io/jans/as/client/BaseClient.java

@@ -17,14 +17,14 @@
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;

jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponse.java

@@ -6,8 +6,8 @@
 
 package io.jans.as.client;
 
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 
 /**
  * @author Javier Rojas Blum

jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponseWithErrors.java

@@ -14,7 +14,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnEnabler.java

@@ -9,8 +9,8 @@
 import io.jans.as.model.common.AuthenticationMethod;
 import io.jans.as.model.token.ClientAssertionType;
 
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.Form;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.core.Form;
 
 
 /**

jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoClient.java

@@ -15,10 +15,10 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
 import java.util.Iterator;
 
 /**

jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoResponse.java

@@ -8,7 +8,7 @@
 
 import io.jans.as.model.userinfo.UserInfoErrorResponseType;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Represents an client info response received from the authorization server.

jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzClient.java

@@ -13,10 +13,10 @@
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.json.JSONObject;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
 
 import static io.jans.as.model.authorize.DeviceAuthorizationRequestParam.CLIENT_ID;
 import static io.jans.as.model.authorize.DeviceAuthorizationRequestParam.SCOPE;

jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzRequest.java

@@ -13,7 +13,7 @@
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.HashMap;

jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzResponse.java

@@ -13,7 +13,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Represents a device authz response received from the authorization server.

jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java

@@ -15,9 +15,9 @@
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.core.MediaType;
 import java.util.Map;
 
 /**

jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java

@@ -11,9 +11,9 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.core.MediaType;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;

jans-auth-server/client/src/main/java/io/jans/as/client/JwkClient.java

@@ -14,9 +14,9 @@
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
 import org.json.JSONObject;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.core.MediaType;
 
 import static io.jans.as.model.jwk.JWKParameter.JSON_WEB_KEY_SET;
 

jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationClient.java

@@ -12,9 +12,9 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.core.MediaType;
 
 import static io.jans.as.model.configuration.ConfigurationResponseClaim.ACR_VALUES_SUPPORTED;
 import static io.jans.as.model.configuration.ConfigurationResponseClaim.AUTHORIZATION_ENCRYPTION_ALG_VALUES_SUPPORTED;

jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryClient.java

@@ -15,11 +15,11 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.net.URISyntaxException;
 
 import static io.jans.as.model.discovery.WebFingerParam.HREF;

jans-auth-server/client/src/main/java/io/jans/as/client/RegisterClient.java

@@ -14,11 +14,11 @@
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.core.MediaType;
 import java.util.List;
 
 /**

jans-auth-server/client/src/main/java/io/jans/as/client/RegisterRequest.java

@@ -26,7 +26,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 import java.util.*;
 
 import static io.jans.as.client.util.ClientUtil.*;

jans-auth-server/client/src/main/java/io/jans/as/client/RegisterResponse.java

@@ -17,7 +17,7 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;

jans-auth-server/client/src/main/java/io/jans/as/client/RevokeSessionClient.java

@@ -8,9 +8,9 @@
 
 import org.apache.log4j.Logger;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
 
 /**
  * @author Yuriy Zabrovarnyy

jans-auth-server/client/src/main/java/io/jans/as/client/RevokeSessionRequest.java

@@ -9,7 +9,7 @@
 import io.jans.as.model.common.AuthenticationMethod;
 import io.jans.as.model.util.QueryBuilder;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 /**
  * @author Yuriy Zabrovarnyy

jans-auth-server/client/src/main/java/io/jans/as/client/RevokeSessionResponse.java

@@ -8,7 +8,7 @@
 
 import io.jans.as.model.session.EndSessionErrorResponseType;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 /**
  * @author Yuriy Zabrovarnyy

jans-auth-server/client/src/main/java/io/jans/as/client/TokenClient.java

@@ -10,9 +10,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
 
 import static io.jans.as.model.token.TokenRequestParam.ASSERTION;
 import static io.jans.as.model.token.TokenRequestParam.AUTH_REQ_ID;

jans-auth-server/client/src/main/java/io/jans/as/client/TokenRequest.java

@@ -13,7 +13,7 @@
 import io.jans.as.model.uma.UmaScopeType;
 import io.jans.as.model.util.QueryBuilder;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 import java.util.HashMap;
 import java.util.Map;
 

jans-auth-server/client/src/main/java/io/jans/as/client/TokenResponse.java

@@ -13,7 +13,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Represents a token response received from the authorization server.

jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationClient.java

@@ -11,9 +11,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
 
 /**
  * Encapsulates functionality to make token revocation request calls to an authorization server via REST Services.