diff --git a/oap-ws-account-api/src/main/java/oap/ws/account/User.java b/oap-ws-account-api/src/main/java/oap/ws/account/User.java
index 09e4c933..5493c446 100644
--- a/oap-ws-account-api/src/main/java/oap/ws/account/User.java
+++ b/oap-ws-account-api/src/main/java/oap/ws/account/User.java
@@ -112,7 +112,7 @@ public String getAccessKey() {
     }
 
     public void refreshApiKey() {
-        this.apiKey = org.apache.commons.lang.RandomStringUtils.random( 30, true, true );
+        this.apiKey = org.apache.commons.lang3.RandomStringUtils.random( 30, true, true );
     }
 
     public String getSecretKey() {
diff --git a/oap-ws-openapi-ws/src/test/java/oap/ws/openapi/ExampleNewWS.java b/oap-ws-openapi-ws/src/test/java/oap/ws/openapi/ExampleNewWS.java
index 1981a7d2..9a209309 100644
--- a/oap-ws-openapi-ws/src/test/java/oap/ws/openapi/ExampleNewWS.java
+++ b/oap-ws-openapi-ws/src/test/java/oap/ws/openapi/ExampleNewWS.java
@@ -1,7 +1,6 @@
 
 package oap.ws.openapi;
 
-import aQute.lib.base64.Base64;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import oap.http.server.nio.HttpServerExchange;
 import oap.json.ext.Ext;
@@ -16,6 +15,7 @@
 
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -97,12 +97,13 @@ public void code( int code, HttpServerExchange exchange ) {
     public String bytesParam( @WsParam( from = BODY ) byte[] bytes ) {
         return new String( bytes );
     }
+
     public byte[] bytesResult( @WsParam( from = BODY ) String toBytes ) {
-        return Base64.decodeBase64( toBytes );
+        return Base64.getDecoder().decode( toBytes );
     }
 
     public List<byte[]> listOfBytesResult( @WsParam( from = BODY ) String toBytes ) {
-        return Lists.of( Base64.decodeBase64( toBytes ), new byte[] { 0x1, 0x2, 0x3 } );
+        return Lists.of( Base64.getDecoder().decode( toBytes ), new byte[] { 0x1, 0x2, 0x3 } );
     }
 
     public String stringParam( @WsParam( from = BODY ) String bytes ) {
@@ -112,9 +113,11 @@ public String stringParam( @WsParam( from = BODY ) String bytes ) {
     public oap.util.Stream<String> getOapStreamOfStrings() {
         return Stream.of();
     }
+
     public java.util.stream.Stream<String> getVanillaStreamOfStrings( @WsParam( from = BODY ) List<String> str ) {
         return new ArrayList<>( str ).stream();
     }
+
     public CreativeUniversal getCreativeUniversal() {
         return new CreativeUniversal();
     }
diff --git a/oap-ws-openapi/src/main/java/oap/ws/openapi/OpenapiGenerator.java b/oap-ws-openapi/src/main/java/oap/ws/openapi/OpenapiGenerator.java
index 638e7796..b6a4208c 100644
--- a/oap-ws-openapi/src/main/java/oap/ws/openapi/OpenapiGenerator.java
+++ b/oap-ws-openapi/src/main/java/oap/ws/openapi/OpenapiGenerator.java
@@ -59,7 +59,7 @@
 import oap.ws.WsParam;
 import oap.ws.api.Info.WebMethodInfo;
 import oap.ws.openapi.swagger.DeprecationAnnotationResolver;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 
 import java.lang.reflect.GenericArrayType;
diff --git a/pom.xml b/pom.xml
index ba922900..99f0c3ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,12 +72,12 @@
     </distributionManagement>
 
     <properties>
-        <oap-ws.project.version>21.2.1</oap-ws.project.version>
+        <oap-ws.project.version>21.2.2</oap-ws.project.version>
 
-        <oap.deps.oap.version>21.2.0</oap.deps.oap.version>
+        <oap.deps.oap.version>21.2.1</oap.deps.oap.version>
 
-        <oap.deps.mail.version>21.1.1</oap.deps.mail.version>
-        <oap.deps.storage.version>21.1.0</oap.deps.storage.version>
+        <oap.deps.mail.version>21.1.2</oap.deps.mail.version>
+        <oap.deps.storage.version>21.1.1</oap.deps.storage.version>
 
         <oap.deps.guava.version>33.0.0-jre</oap.deps.guava.version>
         <oap.deps.slf4j.version>2.0.9</oap.deps.slf4j.version>