diff --git a/github-pullrequest-plugin/pom.xml b/github-pullrequest-plugin/pom.xml
index 5eaf9599..ee3a2131 100644
--- a/github-pullrequest-plugin/pom.xml
+++ b/github-pullrequest-plugin/pom.xml
@@ -74,6 +74,14 @@
 
     <dependencies>
         <!--main plugin deps-->
+        <dependency>
+            <groupId>io.jenkins.plugins</groupId>
+            <artifactId>commons-lang3-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.jenkins.plugins</groupId>
+            <artifactId>commons-text-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.coravy.hudson.plugins.github</groupId>
             <artifactId>github</artifactId>
diff --git a/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubCause.java b/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubCause.java
index 329d4b97..b0ff1f38 100644
--- a/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubCause.java
+++ b/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubCause.java
@@ -17,7 +17,7 @@
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 import static org.apache.commons.io.FileUtils.readFileToString;
-import static org.apache.commons.lang.StringUtils.abbreviate;
+import static org.apache.commons.lang3.StringUtils.abbreviate;
 
 /**
  * @author Kanstantsin Shautsou
diff --git a/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubEnv.java b/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubEnv.java
index ae3ef8a9..be5218a2 100644
--- a/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubEnv.java
+++ b/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubEnv.java
@@ -6,8 +6,8 @@
 
 import java.util.List;
 
-import static org.apache.commons.lang.StringEscapeUtils.escapeJava;
-import static org.apache.commons.lang.StringUtils.trimToEmpty;
+import static org.apache.commons.text.StringEscapeUtils.escapeJava;
+import static org.apache.commons.lang3.StringUtils.trimToEmpty;
 
 public interface GitHubEnv<T extends GitHubCause<?>> {
 
diff --git a/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubTriggerDescriptor.java b/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubTriggerDescriptor.java
index 8f4bef3d..2cf4958b 100644
--- a/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubTriggerDescriptor.java
+++ b/github-pullrequest-plugin/src/main/java/com/github/kostyasha/github/integration/generic/GitHubTriggerDescriptor.java
@@ -20,7 +20,7 @@
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.jenkinsci.plugins.github.config.GitHubServerConfig.withHost;
 import static org.jenkinsci.plugins.github.util.FluentIterableWrapper.from;
 
diff --git a/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/GitHubPRMessage.java b/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/GitHubPRMessage.java
index 9b071337..a06e3fa1 100644
--- a/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/GitHubPRMessage.java
+++ b/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/GitHubPRMessage.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 import static java.util.Objects.nonNull;
-import static org.apache.commons.lang.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 /**
  * Represents a comment for GitHub that can contain token macros.
diff --git a/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/events/impl/GitHubPRDescriptionEvent.java b/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/events/impl/GitHubPRDescriptionEvent.java
index 8957fded..bedff742 100644
--- a/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/events/impl/GitHubPRDescriptionEvent.java
+++ b/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/events/impl/GitHubPRDescriptionEvent.java
@@ -3,7 +3,7 @@
 import com.github.kostyasha.github.integration.generic.GitHubPRDecisionContext;
 import hudson.Extension;
 import hudson.model.TaskListener;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.github.pullrequest.GitHubPRCause;
 import org.jenkinsci.plugins.github.pullrequest.GitHubPRPullRequest;
diff --git a/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/publishers/impl/GitHubPRBuildStatusPublisher.java b/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/publishers/impl/GitHubPRBuildStatusPublisher.java
index 551e2fce..a49d065f 100644
--- a/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/publishers/impl/GitHubPRBuildStatusPublisher.java
+++ b/github-pullrequest-plugin/src/main/java/org/jenkinsci/plugins/github/pullrequest/publishers/impl/GitHubPRBuildStatusPublisher.java
@@ -31,7 +31,7 @@
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
-import static org.apache.commons.lang.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 import static org.jenkinsci.plugins.github.pullrequest.utils.JobHelper.addComment;
 import static org.jenkinsci.plugins.github.pullrequest.utils.JobHelper.getCommitState;