diff --git a/pom.xml b/pom.xml
index f30655c..a88c057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,10 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-text-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>jsch</artifactId>
diff --git a/src/main/java/jenkins/plugins/ssh2easy/gssh/GsshBuilderWrapper.java b/src/main/java/jenkins/plugins/ssh2easy/gssh/GsshBuilderWrapper.java
index 77cb45c..85d1810 100644
--- a/src/main/java/jenkins/plugins/ssh2easy/gssh/GsshBuilderWrapper.java
+++ b/src/main/java/jenkins/plugins/ssh2easy/gssh/GsshBuilderWrapper.java
@@ -13,11 +13,11 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.logging.Logger;
 import javax.servlet.ServletException;
 import jenkins.plugins.ssh2easy.gssh.client.SshClient;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
@@ -123,7 +123,7 @@ public BuildStepMonitor getRequiredMonitorService() {
     }
 
     private void log(final PrintStream logger, final String message) {
-        logger.println(StringUtils.defaultString(DESCRIPTOR.getShortName()) + message);
+        logger.println(Objects.toString(DESCRIPTOR.getShortName(), "") + message);
     }
 
     public boolean isDisable() {
diff --git a/src/main/java/jenkins/plugins/ssh2easy/gssh/client/DefaultSshClient.java b/src/main/java/jenkins/plugins/ssh2easy/gssh/client/DefaultSshClient.java
index 4717071..0be5746 100644
--- a/src/main/java/jenkins/plugins/ssh2easy/gssh/client/DefaultSshClient.java
+++ b/src/main/java/jenkins/plugins/ssh2easy/gssh/client/DefaultSshClient.java
@@ -16,7 +16,7 @@
 import jenkins.plugins.ssh2easy.gssh.GsshPluginException;
 import jenkins.plugins.ssh2easy.gssh.GsshUserInfo;
 import jenkins.plugins.ssh2easy.gssh.ServerGroup;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 /**
  * This is Ssh handler , user for handling SSH related event and requirments
@@ -266,7 +266,7 @@ protected String wrapperInput(String input) {
      * @return
      */
     private String fixIEIssue(String input) {
-        return StringEscapeUtils.unescapeHtml(input);
+        return StringEscapeUtils.unescapeHtml4(input);
     }
 
     public String getIp() {