diff --git a/pom.xml b/pom.xml
index 0e80713b..e236eece 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,10 @@
     </pluginRepository>
   </pluginRepositories>
   <dependencies>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-project</artifactId>
diff --git a/src/main/java/htmlpublisher/HtmlPublisher.java b/src/main/java/htmlpublisher/HtmlPublisher.java
index 645414aa..c211e64a 100644
--- a/src/main/java/htmlpublisher/HtmlPublisher.java
+++ b/src/main/java/htmlpublisher/HtmlPublisher.java
@@ -47,7 +47,7 @@
 
 import hudson.util.DirScanner;
 import jenkins.util.SystemProperties;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.accmod.restrictions.suppressions.SuppressRestrictedWarnings;
diff --git a/src/main/java/htmlpublisher/HtmlPublisherTarget.java b/src/main/java/htmlpublisher/HtmlPublisherTarget.java
index db8d879f..b5f85a6c 100644
--- a/src/main/java/htmlpublisher/HtmlPublisherTarget.java
+++ b/src/main/java/htmlpublisher/HtmlPublisherTarget.java
@@ -17,8 +17,7 @@
 import hudson.model.Descriptor;
 import hudson.util.HttpResponses;
 import jenkins.model.RunAction2;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -31,6 +30,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.HexFormat;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -224,9 +224,10 @@ public static String sanitizeReportName(String reportName, boolean escapeUndersc
         }
         Matcher m = p.matcher(reportName);
         StringBuffer sb = new StringBuffer();
+        HexFormat hex = HexFormat.of();
         while (m.find()) {
             String match = m.group();
-            m.appendReplacement(sb, "_" + Hex.encodeHexString(match.getBytes(StandardCharsets.UTF_8)));
+            m.appendReplacement(sb, "_" + hex.formatHex(match.getBytes(StandardCharsets.UTF_8)));
         }
         m.appendTail(sb);
         return sb.toString();