Skip to content

Commit

Permalink
feat(jans): jetty 11 integration (#1123)
Browse files Browse the repository at this point in the history 
* feat: jetty upgrade

* feat: jetty upgrade

* feat: jetty upgrade

* feat(jans-jetty-upgrade): orm changes to replace javax with jakarta

* feat(jans-jetty-upgrade): orm changes to replace javax with jakarta

* feat(jans-jetty-upgrade): orm changes to replace javax with jakarta

* feat: jetty upgrade changes

* feat: jetty upgrade changes

* feat: removed unused dependency

* feat: jans auth jetty upgrade - wip

* feat: jetty upgrade code for jans-auth

* feat(jans): jetty upgrade to version 11

* feat(jans) sync with main

* feat(jans) sync with main

* feat(jans-scim): jetty upgrade to version 11.0.8

* feat(jans): updated beans.xml to use jakarta cdi

* feat(jans-auth-server): updated code to use jakarta lib

* feat(jans-auth-server): updated code to use jakarta lib

* feat(jans-auth): jetty upgrade xml schema changes

* feat(jans-auth): jetty xml change for upgrade to version 11

* feat: jetty upgrade dependency and xml changes

* feat(jans-auth): jetty upgrade changes wrt to faces

* feat(jans-auth): jetty upgrade changes

* feat: jetty upgrade changes

* feat(jans-config-api): jetty upgrade changes

* feat(jans-config-api): jetty upgrade changes

* feat(jans-config_api): json related changes

* feat(jans-eleven): jetty upgrade changes

* feat(jans-fido2): jetty upgrade changes

* feat(jans-notify): jetty upgrade changes

* feat(jans-notify): jetty upgrade changes

* feat(jans-client-api): jetty upgrade changes

* feat(jans-config-api): jetty upgrade changes

* feat(jans-config-api): jetty upgrade changes

* feat(jans): dependency changes to solve sonar issue

* feat(jans-config-api): dependency changes to solve sonar issue

* feat(jans-config-api): dependency changes to solve sonar issue

* feat(jans): dependency changes to solve sonar issue

* feat(jans-config-api): dependency changes to solve sonar issue

* chore: rename pom versions to avoid rewriting existing artifacts

* feat: bom and orm jetty upgrade changed

* feat(jans-orm): orm jetty upgrade changed

* feat(jans-core): orm jetty upgrade changed

* feat(jans-core): jetty upgrade changed

* feat(jans-core): jetty upgrade changed

* feat(jans-fido2): jetty upgrade changed

* feat(jans-scim): jetty upgrade changed

* feat(jans-notify): jetty upgrade changed

* feat(jans-auth-server): jetty upgrade changed

* feat(jans-eleven): jetty upgrade changed

* feat(jans-auth-server): jetty upgrade changed

* feat(jans-auth-server): jetty upgrade changed

* feat(jans-auth-server): jetty upgrade changed

* feat(jans-auth-server): jetty upgrade changed

* feat(jans-auth-server): jetty upgrade changed

* feat(jans-config-api): jetty upgrade changes

* feat(jans-client-api): jetty upgrade changes

* feat(jans-client-api): jetty upgrade changes

* fix: update base jetty version

* fix: update jackson patch

Addresses CVE-2020-36518

* ci: update autobuild

* fix: correcting built errors

* feat(jans-auth): jetty upgrade changes

* feat: jans-linux-setup jetty-11 deployment

* fix: jans-linux-setup download jetty-11 war files

* feat(jans-config-api): swagger spec changes to fix get LDAP config by name issue

* fix: jans-linux-setup avoid installing jython pip

* Revert "fix: jans-linux-setup avoid installing jython pip"

This reverts commit a75d8e6.

* fix(jans-auth-server): adapted registration code to jakarta

#951

* fix(jans-config-api): adapted code to jakarta

#951

* feat: fixed merge with main code for jetty upgrade

* feat(jans-config-api): fixed sonar quality gate and cache and client patch issue

* feat(jans-config-api): fixed cache and client patch issue, sonarqube code smells

* feat(jans-config-api): code syn with main

* fix: modify poms to 1.0.0-SNAPSHOT

Co-authored-by: Jose <bonustrack310@gmail.com>
Co-authored-by: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com>
Co-authored-by: Arnab Dutta <arnab.bdutta@gmail.com>
Co-authored-by: Mustafa Baser <mbaser@mail.com>
Co-authored-by: YuriyZ <yzabrovarniy@gmail.com>
  • Loading branch information
@pujavs @jgomer2001
@moabu @duttarnab @devrimyatar @yuriyz
6 people committed Apr 22, 2022
1 parent 230f987 commit 6c1caa1
Show file tree
Hide file tree
Showing 1,036 changed files with 4,769 additions and 4,671 deletions.
2 changes: 1 addition & 1 deletion docker-jans-auth-server/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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
Expand Down
4 changes: 2 additions & 2 deletions jans-auth-server/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizeClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions jans-auth-server/client/src/main/java/io/jans/as/client/BaseClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponseWithErrors.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnEnabler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
8 changes: 4 additions & 4 deletions jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
6 changes: 3 additions & 3 deletions jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions jans-auth-server/client/src/main/java/io/jans/as/client/JwkClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions jans-auth-server/client/src/main/java/io/jans/as/client/RegisterClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/RegisterRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/RegisterResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions jans-auth-server/client/src/main/java/io/jans/as/client/RevokeSessionClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/RevokeSessionRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/RevokeSessionResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions jans-auth-server/client/src/main/java/io/jans/as/client/TokenClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/TokenRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/client/src/main/java/io/jans/as/client/TokenResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 6c1caa1

Please sign in to comment.