diff --git a/pom.xml b/pom.xml
index 35980ff..0864d52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,10 @@
     </dependencies>
   </dependencyManagement>
   <dependencies>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
diff --git a/src/main/java/au/com/rayh/DeveloperProfileLoader.java b/src/main/java/au/com/rayh/DeveloperProfileLoader.java
index 676e28c..d9b4078 100644
--- a/src/main/java/au/com/rayh/DeveloperProfileLoader.java
+++ b/src/main/java/au/com/rayh/DeveloperProfileLoader.java
@@ -34,8 +34,8 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
diff --git a/src/main/java/au/com/rayh/ExportIpa.java b/src/main/java/au/com/rayh/ExportIpa.java
index c4e93bd..2b0d547 100644
--- a/src/main/java/au/com/rayh/ExportIpa.java
+++ b/src/main/java/au/com/rayh/ExportIpa.java
@@ -9,9 +9,9 @@
 import hudson.util.FormValidation;
 import hudson.util.Secret;
 import jenkins.tasks.SimpleBuildStep;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
diff --git a/src/main/java/au/com/rayh/GlobalConfigurationImpl.java b/src/main/java/au/com/rayh/GlobalConfigurationImpl.java
index ce18203..641bdda 100644
--- a/src/main/java/au/com/rayh/GlobalConfigurationImpl.java
+++ b/src/main/java/au/com/rayh/GlobalConfigurationImpl.java
@@ -25,7 +25,7 @@
 
 import net.sf.json.JSONObject;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
diff --git a/src/main/java/au/com/rayh/JenkinsXCodeBuildOutputParser.java b/src/main/java/au/com/rayh/JenkinsXCodeBuildOutputParser.java
index 0e4249b..21317a0 100644
--- a/src/main/java/au/com/rayh/JenkinsXCodeBuildOutputParser.java
+++ b/src/main/java/au/com/rayh/JenkinsXCodeBuildOutputParser.java
@@ -40,7 +40,7 @@
 import java.text.SimpleDateFormat;
 import java.util.GregorianCalendar;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *
diff --git a/src/main/java/au/com/rayh/Keychain.java b/src/main/java/au/com/rayh/Keychain.java
index ae46028..f0d427a 100644
--- a/src/main/java/au/com/rayh/Keychain.java
+++ b/src/main/java/au/com/rayh/Keychain.java
@@ -1,7 +1,7 @@
 package au.com.rayh;
 
 import hudson.util.Secret;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
diff --git a/src/main/java/au/com/rayh/KeychainPasswordAndPathBinding.java b/src/main/java/au/com/rayh/KeychainPasswordAndPathBinding.java
index 1b13e1c..e536d2b 100644
--- a/src/main/java/au/com/rayh/KeychainPasswordAndPathBinding.java
+++ b/src/main/java/au/com/rayh/KeychainPasswordAndPathBinding.java
@@ -32,7 +32,7 @@
 import hudson.Launcher;
 import hudson.model.Run;
 import hudson.model.TaskListener;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.credentialsbinding.BindingDescriptor;
 import org.jenkinsci.plugins.credentialsbinding.MultiBinding;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/src/main/java/au/com/rayh/KeychainUnlockStep.java b/src/main/java/au/com/rayh/KeychainUnlockStep.java
index 74b24a4..33734a7 100644
--- a/src/main/java/au/com/rayh/KeychainUnlockStep.java
+++ b/src/main/java/au/com/rayh/KeychainUnlockStep.java
@@ -21,8 +21,8 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
diff --git a/src/main/java/au/com/rayh/MobileProvisionParser.java b/src/main/java/au/com/rayh/MobileProvisionParser.java
index 2e74329..97defce 100644
--- a/src/main/java/au/com/rayh/MobileProvisionParser.java
+++ b/src/main/java/au/com/rayh/MobileProvisionParser.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
diff --git a/src/main/java/au/com/rayh/XCodeBuilder.java b/src/main/java/au/com/rayh/XCodeBuilder.java
index 5006dc8..63d1cc2 100644
--- a/src/main/java/au/com/rayh/XCodeBuilder.java
+++ b/src/main/java/au/com/rayh/XCodeBuilder.java
@@ -46,9 +46,9 @@
 import hudson.util.Secret;
 import jenkins.tasks.SimpleBuildStep;
 import org.jenkinsci.Symbol;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
 import org.jenkinsci.plugins.tokenmacro.TokenMacro;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/src/main/java/au/com/rayh/XcodeBuildHelpParser.java b/src/main/java/au/com/rayh/XcodeBuildHelpParser.java
index 25cf378..7a5b1a3 100644
--- a/src/main/java/au/com/rayh/XcodeBuildHelpParser.java
+++ b/src/main/java/au/com/rayh/XcodeBuildHelpParser.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Created by Kazuhide Takahashi on 5/9/14.
diff --git a/src/main/java/au/com/rayh/XcodeBuildListParser.java b/src/main/java/au/com/rayh/XcodeBuildListParser.java
index 5074e74..0847abf 100644
--- a/src/main/java/au/com/rayh/XcodeBuildListParser.java
+++ b/src/main/java/au/com/rayh/XcodeBuildListParser.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
diff --git a/src/main/java/au/com/rayh/XcodeCredentialsHelper.java b/src/main/java/au/com/rayh/XcodeCredentialsHelper.java
index 5c50bf2..52a1cc2 100644
--- a/src/main/java/au/com/rayh/XcodeCredentialsHelper.java
+++ b/src/main/java/au/com/rayh/XcodeCredentialsHelper.java
@@ -6,7 +6,7 @@
 import hudson.model.ItemGroup;
 import hudson.security.ACL;
 import hudson.util.ListBoxModel;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.util.Collections;