fix(bom): deprecate commons-lang due to conflict with commons-lang3 (#…

…10267) * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(bom): deprecate commons-lang due to conflict with commons-lang3 Signed-off-by: Yuriy Movchan <[email protected]> * fix(core): fix NPE after configuration libs upgrade Signed-off-by: Yuriy Movchan <[email protected]> * fix(orm): fix NPE after configuration libs upgrade Signed-off-by: Yuriy Movchan <[email protected]> * fix(scim): add missing commons-beanutils library Signed-off-by: Yuriy Movchan <[email protected]> --------- Signed-off-by: Yuriy Movchan <[email protected]>
JanssenProject · Nov 26, 2024 · a689993 · a689993
1 parent c2bbedd
commit a689993
Show file tree

Hide file tree

Showing 348 changed files with 470 additions and 452 deletions.
diff --git a/docs/script-catalog/client_authn/ClientAuthn.java b/docs/script-catalog/client_authn/ClientAuthn.java
@@ -16,7 +16,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/jans-auth-server/client/pom.xml b/jans-auth-server/client/pom.xml
@@ -208,8 +208,8 @@
 			<artifactId>commons-codec</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
 		</dependency>
         <dependency>
             <groupId>commons-cli</groupId>

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/AccessEvaluationClientResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/AccessEvaluationClientResponse.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.jans.model.authzen.AccessEvaluationResponse;
 import jakarta.ws.rs.core.Response;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 /**

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationRequest.java
@@ -13,7 +13,7 @@
 import io.jans.as.model.common.ResponseMode;
 import io.jans.as.model.common.ResponseType;
 import io.jans.as.model.util.Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java
@@ -16,7 +16,7 @@
 import io.jans.as.model.util.JwtUtil;
 import io.jans.as.model.util.QueryStringDecoder;
 import io.jans.as.model.util.Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationClient.java
@@ -9,7 +9,7 @@
 import io.jans.as.model.ciba.BackchannelAuthenticationRequestParam;
 import io.jans.as.model.common.AuthenticationMethod;
 import io.jans.as.model.util.Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
 

diff --git a/...auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationResponse.java b/...auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationResponse.java
@@ -7,7 +7,7 @@
 package io.jans.as.client;
 
 import io.jans.as.model.ciba.BackchannelAuthenticationErrorResponseType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/BaseClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/BaseClient.java
@@ -19,7 +19,7 @@
 import jakarta.ws.rs.core.Form;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/BaseRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/BaseRequest.java
@@ -10,7 +10,7 @@
 import io.jans.as.model.common.AuthorizationMethod;
 import io.jans.as.model.util.Util;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponseWithErrors.java b/jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponseWithErrors.java
@@ -8,7 +8,7 @@
 
 import io.jans.as.model.config.Constants;
 import io.jans.as.model.error.IErrorType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONException;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnEnabler.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnEnabler.java
@@ -11,7 +11,7 @@
 
 import jakarta.ws.rs.client.Invocation.Builder;
 import jakarta.ws.rs.core.Form;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnRequest.java
@@ -13,7 +13,7 @@
 import io.jans.as.model.jwt.JwtType;
 import io.jans.as.model.token.ClientAssertionType;
 import io.jans.as.model.util.QueryBuilder;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import java.util.Calendar;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoClient.java
@@ -8,7 +8,7 @@
 
 import io.jans.as.client.util.ClientUtil;
 import io.jans.as.model.common.AuthorizationMethod;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzClient.java
@@ -7,7 +7,7 @@
 package io.jans.as.client;
 
 import io.jans.as.model.util.Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzRequest.java
@@ -9,7 +9,7 @@
 import io.jans.as.model.authorize.AuthorizeRequestParam;
 import io.jans.as.model.common.AuthenticationMethod;
 import io.jans.as.model.util.Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzResponse.java
@@ -8,7 +8,7 @@
 
 import io.jans.as.model.authorize.DeviceAuthorizationResponseParam;
 import io.jans.as.model.authorize.DeviceAuthzErrorResponseType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java
@@ -12,7 +12,7 @@
 import io.jans.as.model.session.EndSessionResponseParam;
 import io.jans.as.model.util.QueryStringDecoder;
 import io.jans.as.model.util.Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
 

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionRequest.java
@@ -8,7 +8,7 @@
 
 import io.jans.as.model.session.EndSessionRequestParam;
 import io.jans.as.model.util.Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java
@@ -6,7 +6,7 @@
 
 package io.jans.as.client;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/JwkClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/JwkClient.java
@@ -10,7 +10,7 @@
 import io.jans.as.model.crypto.signature.ECDSAPublicKey;
 import io.jans.as.model.crypto.signature.RSAPublicKey;
 import io.jans.as.model.jwk.JSONWebKeySet;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
 import org.json.JSONObject;
 

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationClient.java
@@ -7,7 +7,7 @@
 package io.jans.as.client;
 
 import io.jans.as.model.util.Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationResponse.java
@@ -6,7 +6,7 @@
 
 package io.jans.as.client;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryClient.java
@@ -7,7 +7,7 @@
 package io.jans.as.client;
 
 import io.jans.as.model.discovery.WebFingerLink;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryRequest.java
@@ -6,7 +6,7 @@
 
 package io.jans.as.client;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterClient.java
@@ -9,7 +9,7 @@
 import io.jans.as.client.builder.RegistrationBuilder;
 import io.jans.as.client.util.ClientUtil;
 import io.jans.as.model.register.ApplicationType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.jboss.resteasy.client.jaxrs.ClientHttpEngine;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterRequest.java
@@ -22,7 +22,7 @@
 import io.jans.as.model.register.RegisterRequestParam;
 import io.jans.orm.model.base.LocalizedString;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONException;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterResponse.java
@@ -12,7 +12,7 @@
 import io.jans.as.model.register.RegisterErrorResponseType;
 import io.jans.as.model.register.RegisterResponseParam;
 import io.jans.as.model.util.Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenClient.java
@@ -7,7 +7,7 @@
 package io.jans.as.client;
 
 import io.jans.as.model.common.GrantType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import jakarta.ws.rs.HttpMethod;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRequest.java
@@ -14,7 +14,7 @@
 import io.jans.as.model.util.QueryBuilder;
 
 import jakarta.ws.rs.core.MediaType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenResponse.java
@@ -10,7 +10,7 @@
 import io.jans.as.model.common.TokenType;
 import io.jans.as.model.token.TokenErrorResponseType;
 import jakarta.ws.rs.core.Response;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationClient.java
@@ -8,7 +8,7 @@
 
 import io.jans.as.model.common.TokenTypeHint;
 import io.jans.as.model.token.TokenRevocationRequestParam;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
 import jakarta.ws.rs.HttpMethod;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationResponse.java
@@ -8,7 +8,7 @@
 
 import io.jans.as.model.config.Constants;
 import io.jans.as.model.token.TokenRevocationErrorResponseType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoClient.java
@@ -12,7 +12,7 @@
 import io.jans.as.model.jwe.Jwe;
 import io.jans.as.model.jwt.Jwt;
 import io.jans.as.model.util.JwtUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoRequest.java
@@ -7,7 +7,7 @@
 package io.jans.as.client;
 
 import io.jans.as.model.common.AuthorizationMethod;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingClient.java b/...-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingClient.java
@@ -7,7 +7,7 @@
 package io.jans.as.client.ciba.fcm;
 
 import io.jans.as.client.BaseClient;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
 

diff --git a/...server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingRequest.java b/...server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingRequest.java
@@ -7,7 +7,7 @@
 package io.jans.as.client.ciba.fcm;
 
 import io.jans.as.client.BaseRequest;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 

diff --git a/...erver/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingResponse.java b/...erver/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingResponse.java
@@ -7,7 +7,7 @@
 package io.jans.as.client.ciba.fcm;
 
 import io.jans.as.client.BaseResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONException;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackClient.java
@@ -8,7 +8,7 @@
 
 import io.jans.as.client.BaseClient;
 import io.jans.as.client.util.ClientUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackRequest.java
@@ -7,7 +7,7 @@
 package io.jans.as.client.ciba.ping;
 
 import io.jans.as.client.BaseRequest;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorClient.java
@@ -7,7 +7,7 @@
 package io.jans.as.client.ciba.push;
 
 import io.jans.as.client.BaseClient;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
 

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorRequest.java
@@ -8,7 +8,7 @@
 
 import io.jans.as.client.BaseRequest;
 import io.jans.as.model.ciba.PushErrorResponseType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/...auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryClient.java b/...auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryClient.java
@@ -7,7 +7,7 @@
 package io.jans.as.client.ciba.push;
 
 import io.jans.as.client.BaseClient;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
 

diff --git a/...uth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryRequest.java b/...uth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryRequest.java
@@ -8,7 +8,7 @@
 
 import io.jans.as.client.BaseRequest;
 import io.jans.as.model.common.TokenType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/model/JwtState.java b/jans-auth-server/client/src/main/java/io/jans/as/client/model/JwtState.java
@@ -18,7 +18,7 @@
 import io.jans.as.model.jwt.JwtHeader;
 import io.jans.as.model.jwt.JwtType;
 import io.jans.as.model.util.Base64Util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.json.JSONObject;