diff --git a/modules/client/pom.xml b/modules/client/pom.xml
index e9a828b04..5843684a6 100644
--- a/modules/client/pom.xml
+++ b/modules/client/pom.xml
@@ -151,8 +151,8 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.xml.stream</groupId>
diff --git a/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml b/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
index c748ce9fe..404312442 100644
--- a/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
+++ b/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
@@ -65,7 +65,7 @@
               <include>org.apache.velocity:velocity:jar</include>
               <include>commons-collections:commons-collections:jar</include>
               <include>commons-beanutils:commons-beanutils:jar</include>
-              <include>commons-lang:commons-lang:jar</include>
+              <include>org.apache.commons:commons-lang3:jar</include>
               <include>commons-codec:commons-codec:jar</include>
               <include>jboss.jaxbintros:jboss-jaxb-intros</include>
               <include>javax.xml.stream:stax-api:jar</include>
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index afb2feaae..71c7da3cb 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -157,8 +157,8 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.xml.stream</groupId>
diff --git a/pom.xml b/pom.xml
index df1965a71..00e12f0d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
     <jsr181.api.version>1.0-MR1</jsr181.api.version>
     <commons-beanutils.version>1.9.2</commons-beanutils.version>
     <commons-collections.version>3.2.1</commons-collections.version>
-    <commons-lang.version>2.6</commons-lang.version>
+    <commons-lang3.version>3.5</commons-lang3.version>
     <commons.logging.version>1.1.1</commons.logging.version>
     <log4j.version>1.2.16</log4j.version>
     <org.slf4j.version>1.7.15</org.slf4j.version>
@@ -949,9 +949,9 @@
         <version>${commons-collections.version}</version>
       </dependency>
       <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>${commons-lang.version}</version>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${commons-lang3.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.xml.stream</groupId>