diff --git a/pom.xml b/pom.xml
index abc8fad..6ff85a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,14 @@
     </dependencyManagement>
 
     <dependencies>
+        <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>org.jenkins-ci.plugins</groupId>
diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckMetricUtil.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckMetricUtil.java
index be986b5..a5661b1 100644
--- a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckMetricUtil.java
+++ b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckMetricUtil.java
@@ -1,7 +1,7 @@
 package com.thalesgroup.hudson.plugins.cppcheck;
 
 import com.thalesgroup.hudson.plugins.cppcheck.config.CppcheckConfig;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class CppcheckMetricUtil {
 
diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckResult.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckResult.java
index 5d02150..bd393c2 100644
--- a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckResult.java
+++ b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckResult.java
@@ -29,7 +29,7 @@
 import hudson.model.AbstractBuild;
 import hudson.model.Api;
 import hudson.model.Item;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.export.Exported;
diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckSource.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckSource.java
index a002a01..5204e12 100644
--- a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckSource.java
+++ b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckSource.java
@@ -32,8 +32,8 @@
 import hudson.model.Run;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 
 
 import java.io.*;
@@ -185,7 +185,7 @@ private void splitSourceFile(final String sourceFile) {
      * @param message the message to write
      */
     private void outputEscaped(final StringBuilder output, final String message) {
-        output.append(StringEscapeUtils.escapeHtml(message));
+        output.append(StringEscapeUtils.escapeHtml4(message));
     }
 
     /**
diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckFile.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckFile.java
index 89bba38..42c4885 100644
--- a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckFile.java
+++ b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckFile.java
@@ -25,7 +25,7 @@
 
 import hudson.model.ModelObject;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.export.ExportedBean;
 
@@ -114,7 +114,7 @@ public String getMessage() {
     }
     
     public String getMessageHtml() {
-        return StringEscapeUtils.escapeHtml(message);
+        return StringEscapeUtils.escapeHtml4(message);
     }
 
     public void setMessage(String message) {
@@ -145,7 +145,7 @@ public String getVerbose() {
     }
     
     public String getVerboseHtml() {
-        return StringEscapeUtils.escapeHtml(verbose);
+        return StringEscapeUtils.escapeHtml4(verbose);
     }
 
     public void setVerbose(String verbose) {
diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckWorkspaceFile.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckWorkspaceFile.java
index 86a3453..8389099 100644
--- a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckWorkspaceFile.java
+++ b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckWorkspaceFile.java
@@ -25,7 +25,7 @@
 
 import hudson.model.Run;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.cppcheck.CppcheckDiffState;
 
 import java.io.File;
diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckParserResult.java b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckParserResult.java
index 0083ff3..4aedba5 100644
--- a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckParserResult.java
+++ b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckParserResult.java
@@ -70,7 +70,7 @@ public CppcheckReport invoke(java.io.File basedir, VirtualChannel channel) throw
                 mergeReport(cppcheckReportResult, cppcheckReport);
             }
         } catch (Exception e) {
-            String stack_trace = org.apache.commons.lang.exception.ExceptionUtils.getStackTrace(e);
+            String stack_trace = org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace(e);
             CppcheckLogger.log(listener, "Parsing throws exceptions. " + e.getMessage());
             CppcheckLogger.log(listener, stack_trace);
             return null;
diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckResult.java b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckResult.java
index 5eb6133..b03bf82 100644
--- a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckResult.java
+++ b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckResult.java
@@ -10,7 +10,7 @@
 import hudson.model.Api;
 import hudson.model.Item;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.cppcheck.config.CppcheckConfigSeverityEvaluation;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckSourceAll.java b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckSourceAll.java
index 82667c2..046ea3e 100644
--- a/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckSourceAll.java
+++ b/src/main/java/org/jenkinsci/plugins/cppcheck/CppcheckSourceAll.java
@@ -10,7 +10,7 @@
 import java.util.Collection;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import com.thalesgroup.hudson.plugins.cppcheck.model.CppcheckWorkspaceFile;
 
@@ -133,7 +133,7 @@ private String getRelatedLines(BufferedReader reader, int lineNumber)
                 builder.append("<span class=\"lineNumber\">");
                 builder.append(String.format(numberFormat, current));
                 builder.append("</span> ");// The space separates line number and code
-                builder.append(StringEscapeUtils.escapeHtml(line));
+                builder.append(StringEscapeUtils.escapeHtml4(line));
                 builder.append("</div>\n");
             }
 
diff --git a/src/main/java/org/jenkinsci/plugins/cppcheck/util/CppcheckMetricUtil.java b/src/main/java/org/jenkinsci/plugins/cppcheck/util/CppcheckMetricUtil.java
index c2eca21..082252b 100644
--- a/src/main/java/org/jenkinsci/plugins/cppcheck/util/CppcheckMetricUtil.java
+++ b/src/main/java/org/jenkinsci/plugins/cppcheck/util/CppcheckMetricUtil.java
@@ -1,6 +1,6 @@
 package org.jenkinsci.plugins.cppcheck.util;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author Gregory Boissinot