diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 4542e0d..5d5be0a 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -57,7 +57,7 @@ jobs:
       with:
         servers: |
           [{
-              "id": "sonatype-nexus-snapshots",
+              "id": "central-portal-snapshots",
               "username": "${{ secrets.SONATYPE_BOT_USERNAME }}",
               "password": "${{ secrets.SONATYPE_BOT_TOKEN }}"
           }]
diff --git a/pom.xml b/pom.xml
index 90af38e..c5e5ab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,16 +22,16 @@
   <parent>
     <groupId>org.commonjava</groupId>
     <artifactId>commonjava</artifactId>
-    <version>17</version>
+    <version>21</version>
   </parent>
-  
+
   <groupId>org.commonjava.rwx</groupId>
   <artifactId>rwx-parent</artifactId>
   <version>2.5-SNAPSHOT</version>
-  
+
   <packaging>pom</packaging>
   <inceptionYear>2010</inceptionYear>
-  
+
   <name>RWX XML-RPC APIs for Java</name>
 
   <properties>
@@ -41,18 +41,18 @@
     <enforceBestPractices>false</enforceBestPractices>
     <plugin.jacoco.skip>false</plugin.jacoco.skip>
   </properties>
-  
+
   <modules>
     <module>rwx</module>
     <module>rwx-test</module>
   </modules>
-  
+
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.commonjava.boms</groupId>
         <artifactId>web-commons-bom</artifactId>
-        <version>27</version>
+        <version>31</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -64,17 +64,7 @@
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-templates</artifactId>
-        <version>2.4.6</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.14.0</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.4</version>
+        <version>3.0.17</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -85,7 +75,7 @@
     <url>https://github.com/Commonjava/RWX</url>
     <tag>HEAD</tag>
   </scm>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -115,5 +105,5 @@
       <artifactId>hamcrest-core</artifactId>
     </dependency>
   </dependencies>
-  
+
 </project>
diff --git a/rwx/pom.xml b/rwx/pom.xml
index 42feea4..4a5328e 100644
--- a/rwx/pom.xml
+++ b/rwx/pom.xml
@@ -28,6 +28,10 @@
     <artifactId>rwx</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-templates</artifactId>
@@ -36,10 +40,6 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
diff --git a/rwx/src/main/java/org/commonjava/rwx/core/XmlRpcParser.java b/rwx/src/main/java/org/commonjava/rwx/core/XmlRpcParser.java
index 32d95a8..3cb1e73 100644
--- a/rwx/src/main/java/org/commonjava/rwx/core/XmlRpcParser.java
+++ b/rwx/src/main/java/org/commonjava/rwx/core/XmlRpcParser.java
@@ -15,7 +15,7 @@
  */
 package org.commonjava.rwx.core;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.commonjava.rwx.error.CoercionException;
 import org.commonjava.rwx.error.XmlRpcException;
 import org.commonjava.rwx.vocab.ValueType;
diff --git a/rwx/src/main/java/org/commonjava/rwx/util/ProcessorUtils.java b/rwx/src/main/java/org/commonjava/rwx/util/ProcessorUtils.java
index e5d54bd..621d4fb 100644
--- a/rwx/src/main/java/org/commonjava/rwx/util/ProcessorUtils.java
+++ b/rwx/src/main/java/org/commonjava/rwx/util/ProcessorUtils.java
@@ -15,7 +15,7 @@
  */
 package org.commonjava.rwx.util;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.lang.model.element.Element;
 import java.util.ArrayList;
diff --git a/rwx/src/main/java/org/commonjava/rwx/util/RenderUtils.java b/rwx/src/main/java/org/commonjava/rwx/util/RenderUtils.java
index 19690d4..3092b4f 100644
--- a/rwx/src/main/java/org/commonjava/rwx/util/RenderUtils.java
+++ b/rwx/src/main/java/org/commonjava/rwx/util/RenderUtils.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.apache.commons.lang.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.commonjava.rwx.vocab.XmlRpcConstants.*;
 
 /**