diff --git a/.idea/artifacts/wise_war_exploded.xml b/.idea/artifacts/wise_war_exploded.xml
index 7cf2f0308c..278bb8966b 100644
--- a/.idea/artifacts/wise_war_exploded.xml
+++ b/.idea/artifacts/wise_war_exploded.xml
@@ -55,7 +55,7 @@
           <element id="library" level="project" name="Maven: commons-httpclient:commons-httpclient:3.0.1" />
           <element id="library" level="project" name="Maven: junit:junit:3.8.1" />
           <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.2" />
-          <element id="library" level="project" name="Maven: commons-lang:commons-lang:2.2" />
+          <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
           <element id="library" level="project" name="Maven: com.ibm.icu:icu4j:49.1" />
           <element id="library" level="project" name="Maven: javax.mail:mail:1.4.7" />
           <element id="library" level="project" name="Maven: javax.activation:activation:1.1" />
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_2.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_2.xml
deleted file mode 100644
index 60611366d0..0000000000
--- a/.idea/libraries/Maven__commons_lang_commons_lang_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-lang:commons-lang:2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.2/commons-lang-2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.2/commons-lang-2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.2/commons-lang-2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
new file mode 100644
index 0000000000..78cfcd37a1
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-lang3:3.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 64c1f3d217..8e89407906 100644
--- a/pom.xml
+++ b/pom.xml
@@ -400,9 +400,9 @@
 			<version>3.0.1</version>
 		</dependency>
 		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.2</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.4</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.icu</groupId>
diff --git a/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java b/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java
index ba4a8e678b..b08bb23ebe 100644
--- a/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java
+++ b/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Vector;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.support.DataAccessUtils;
 import org.springframework.security.core.userdetails.UserDetails;
diff --git a/src/main/java/org/wise/portal/domain/project/impl/Projectcode.java b/src/main/java/org/wise/portal/domain/project/impl/Projectcode.java
index c61f4b9d20..0b101f2858 100644
--- a/src/main/java/org/wise/portal/domain/project/impl/Projectcode.java
+++ b/src/main/java/org/wise/portal/domain/project/impl/Projectcode.java
@@ -25,7 +25,7 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * A Projectcode is a <code>String</code> concatenation of:
diff --git a/src/main/java/org/wise/portal/presentation/validators/ChangePasswordParametersValidator.java b/src/main/java/org/wise/portal/presentation/validators/ChangePasswordParametersValidator.java
index 0048b69301..a5ff0a3f65 100644
--- a/src/main/java/org/wise/portal/presentation/validators/ChangePasswordParametersValidator.java
+++ b/src/main/java/org/wise/portal/presentation/validators/ChangePasswordParametersValidator.java
@@ -23,7 +23,7 @@
  */
 package org.wise.portal.presentation.validators;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.dao.SystemWideSaltSource;
 import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
diff --git a/src/main/java/org/wise/portal/presentation/validators/UserAccountFormValidator.java b/src/main/java/org/wise/portal/presentation/validators/UserAccountFormValidator.java
index 6e7b18c484..f0b237caf6 100644
--- a/src/main/java/org/wise/portal/presentation/validators/UserAccountFormValidator.java
+++ b/src/main/java/org/wise/portal/presentation/validators/UserAccountFormValidator.java
@@ -23,7 +23,7 @@
  */
 package org.wise.portal.presentation.validators;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;
 import org.springframework.validation.Validator;
diff --git a/src/main/java/org/wise/portal/presentation/validators/student/TeamSignInFormValidator.java b/src/main/java/org/wise/portal/presentation/validators/student/TeamSignInFormValidator.java
index 4d7a3252de..4f89269399 100644
--- a/src/main/java/org/wise/portal/presentation/validators/student/TeamSignInFormValidator.java
+++ b/src/main/java/org/wise/portal/presentation/validators/student/TeamSignInFormValidator.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.dao.SystemWideSaltSource;
 import org.springframework.security.authentication.encoding.Md5PasswordEncoder;
diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/ResetPasswordController.java b/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/ResetPasswordController.java
index a02dce3c7b..51aa568718 100644
--- a/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/ResetPasswordController.java
+++ b/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/ResetPasswordController.java
@@ -29,7 +29,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/student/PasswordReminderWizardController.java b/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/student/PasswordReminderWizardController.java
index 9000e2d4c1..c8c6e4ed22 100644
--- a/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/student/PasswordReminderWizardController.java
+++ b/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/student/PasswordReminderWizardController.java
@@ -25,7 +25,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/teacher/ForgotAccountTeacherIndexController.java b/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/teacher/ForgotAccountTeacherIndexController.java
index 8f9a0dff89..533cc92596 100644
--- a/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/teacher/ForgotAccountTeacherIndexController.java
+++ b/src/main/java/org/wise/portal/presentation/web/controllers/forgotaccount/teacher/ForgotAccountTeacherIndexController.java
@@ -30,8 +30,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/teacher/TeacherAccountController.java b/src/main/java/org/wise/portal/presentation/web/controllers/teacher/TeacherAccountController.java
index e71a3706a2..777d1fc12a 100644
--- a/src/main/java/org/wise/portal/presentation/web/controllers/teacher/TeacherAccountController.java
+++ b/src/main/java/org/wise/portal/presentation/web/controllers/teacher/TeacherAccountController.java
@@ -30,7 +30,7 @@
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/teacher/project/customized/ShareProjectController.java b/src/main/java/org/wise/portal/presentation/web/controllers/teacher/project/customized/ShareProjectController.java
index c42a3db083..37e888482b 100644
--- a/src/main/java/org/wise/portal/presentation/web/controllers/teacher/project/customized/ShareProjectController.java
+++ b/src/main/java/org/wise/portal/presentation/web/controllers/teacher/project/customized/ShareProjectController.java
@@ -37,8 +37,8 @@
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.security.acls.domain.BasePermission;
diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/teacher/run/CreateRunController.java b/src/main/java/org/wise/portal/presentation/web/controllers/teacher/run/CreateRunController.java
index eaee833ddc..d6839519b2 100644
--- a/src/main/java/org/wise/portal/presentation/web/controllers/teacher/run/CreateRunController.java
+++ b/src/main/java/org/wise/portal/presentation/web/controllers/teacher/run/CreateRunController.java
@@ -40,7 +40,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/teacher/run/ShareProjectRunController.java b/src/main/java/org/wise/portal/presentation/web/controllers/teacher/run/ShareProjectRunController.java
index f4585b74bf..0345a08916 100644
--- a/src/main/java/org/wise/portal/presentation/web/controllers/teacher/run/ShareProjectRunController.java
+++ b/src/main/java/org/wise/portal/presentation/web/controllers/teacher/run/ShareProjectRunController.java
@@ -37,8 +37,8 @@
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.security.acls.domain.BasePermission;
diff --git a/wise.iml b/wise.iml
index 8c16611f14..f140010f9e 100644
--- a/wise.iml
+++ b/wise.iml
@@ -99,7 +99,7 @@
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0.1" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
     <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:49.1" level="project" />
     <orderEntry type="library" name="Maven: javax.mail:mail:1.4.7" level="project" />
     <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />