diff --git a/pom.xml b/pom.xml
index acbe2a5..e3ab605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.18</version>
+    <version>6.2116.v7501b_67dc517</version>
     <relativePath />
   </parent>
 
@@ -22,6 +22,7 @@
       ~ hpi-plugin.version: The HPI Maven Plugin version used by the plugin..
       ~ stapler-plugin.version: The Stapler Maven plugin version required by the plugin.
     -->
+    <ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
   </properties>
 
   <name>REST List Parameter</name>
diff --git a/src/main/java/io/jenkins/plugins/restlistparam/RestListParameterDefinition.java b/src/main/java/io/jenkins/plugins/restlistparam/RestListParameterDefinition.java
index dc3ff4d..6b0347e 100644
--- a/src/main/java/io/jenkins/plugins/restlistparam/RestListParameterDefinition.java
+++ b/src/main/java/io/jenkins/plugins/restlistparam/RestListParameterDefinition.java
@@ -18,7 +18,7 @@
 import io.jenkins.plugins.restlistparam.util.PathExpressionValidationUtils;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
+
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.*;
 import org.kohsuke.stapler.verb.POST;
@@ -75,13 +75,13 @@ public RestListParameterDefinition(final String name,
     this.restEndpoint = restEndpoint;
     this.mimeType = mimeType;
     this.valueExpression = valueExpression;
-    this.credentialId = StringUtils.isNotBlank(credentialId) ? credentialId : "";
+    this.credentialId = credentialId != null && !credentialId.trim().isEmpty() ? credentialId : "";
     if (mimeType == MimeType.APPLICATION_JSON) {
-      this.displayExpression = StringUtils.isNotBlank(displayExpression) ? displayExpression : "$";
+      this.displayExpression = !displayExpression.isBlank() ? displayExpression : "$";
     }
-    this.defaultValue = StringUtils.isNotBlank(defaultValue) ? defaultValue : "";
+    this.defaultValue = defaultValue != null && !defaultValue.trim().isEmpty() ? defaultValue : "";
     this.valueOrder = valueOrder != null ? valueOrder : ValueOrder.NONE;
-    this.filter = StringUtils.isNotBlank(filter) ? filter : ".*";
+    this.filter = !filter.isBlank() ? filter : ".*";
     this.cacheTime = cacheTime != null ? cacheTime : config.getCacheTime();
     this.errorMsg = "";
     this.values = Collections.emptyList();
@@ -105,13 +105,13 @@ private RestListParameterDefinition(final String name,
     this.restEndpoint = restEndpoint;
     this.mimeType = mimeType;
     this.valueExpression = valueExpression;
-    this.credentialId = StringUtils.isNotBlank(credentialId) ? credentialId : "";
+    this.credentialId = credentialId != null && !credentialId.trim().isEmpty() ? credentialId : "";
     if (mimeType == MimeType.APPLICATION_JSON) {
-      this.displayExpression = StringUtils.isNotBlank(displayExpression) ? displayExpression : "$";
+      this.displayExpression = !displayExpression.isBlank() ? displayExpression : "$";
     }
-    this.defaultValue = StringUtils.isNotBlank(defaultValue) ? defaultValue : "";
+    this.defaultValue = defaultValue != null && !defaultValue.trim().isEmpty() ? defaultValue : "";
     this.valueOrder = valueOrder != null ? valueOrder : ValueOrder.NONE;
-    this.filter = StringUtils.isNotBlank(filter) ? filter : ".*";
+    this.filter = !filter.isBlank() ? filter : ".*";
     this.cacheTime = cacheTime != null ? cacheTime : config.getCacheTime();
     this.errorMsg = "";
     this.values = values;
@@ -139,7 +139,7 @@ public String getFilter() {
 
   public String getDisplayExpression() {
     if (mimeType == MimeType.APPLICATION_JSON) {
-      return StringUtils.isNotBlank(displayExpression) ? displayExpression : "$";
+      return !displayExpression.isBlank() ? displayExpression : "$";
     }
     return "";
   }
@@ -328,7 +328,7 @@ public FormValidation doCheckRestEndpoint(@AncestorInPath final Item context,
         context.checkPermission(Item.CONFIGURE);
       }
 
-      if (StringUtils.isNotBlank(value)) {
+      if (value != null && !value.trim().isEmpty()) {
         if (value.matches("^http(s)?://.+")) {
           Optional<StandardCredentials> credentials = CredentialsUtils.findCredentials(context, credentialId);
           return RestValueService.doBasicValidation(value, credentials.orElse(null));
@@ -350,7 +350,7 @@ public FormValidation doCheckValueExpression(@AncestorInPath final Item context,
         context.checkPermission(Item.CONFIGURE);
       }
 
-      if (StringUtils.isNotBlank(value)) {
+      if (value != null && !value.trim().isEmpty()) {
         switch (mimeType) {
           case APPLICATION_JSON:
             return PathExpressionValidationUtils.doCheckJsonPathExpression(value);
@@ -412,17 +412,17 @@ public FormValidation doTestConfiguration(@AncestorInPath final Item context,
         context.checkPermission(Item.CONFIGURE);
       }
 
-      if (StringUtils.isBlank(restEndpoint)) {
+      if (restEndpoint == null || restEndpoint.trim().isEmpty()) {
         return FormValidation.error(Messages.RLP_DescriptorImpl_ValidationErr_EndpointEmpty());
       }
       if (mimeType == null) {
         return FormValidation.error(Messages.RLP_DescriptorImpl_ValidationErr_UnknownMime());
       }
-      if (StringUtils.isBlank(valueExpression)) {
+      if (valueExpression == null || valueExpression.isBlank()) {
         return FormValidation.error(Messages.RLP_DescriptorImpl_ValidationErr_ExpressionEmpty());
       }
       Optional<StandardCredentials> credentials = CredentialsUtils.findCredentials(context, credentialId);
-      if (StringUtils.isNotBlank(credentialId) && !credentials.isPresent()) {
+      if (credentialId != null && !credentialId.trim().isEmpty() && !credentials.isPresent()) {
         return FormValidation.error(Messages.RLP_CredentialsUtils_ValidationErr_CannotFind());
       }
 
@@ -432,7 +432,7 @@ public FormValidation doTestConfiguration(@AncestorInPath final Item context,
         mimeType,
         0,
         valueExpression,
-        StringUtils.isNotBlank(displayExpression) ? displayExpression : "$",
+        !displayExpression.isBlank() ? displayExpression : "$",
         filter,
         valueOrder);
 
diff --git a/src/main/java/io/jenkins/plugins/restlistparam/logic/RestValueService.java b/src/main/java/io/jenkins/plugins/restlistparam/logic/RestValueService.java
index 5d5a5fc..2adab30 100644
--- a/src/main/java/io/jenkins/plugins/restlistparam/logic/RestValueService.java
+++ b/src/main/java/io/jenkins/plugins/restlistparam/logic/RestValueService.java
@@ -14,7 +14,7 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.apache.commons.lang.StringUtils;
+
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 
 import java.io.IOException;
@@ -311,7 +311,7 @@ private static boolean isFilterOrOrderSet(String filter, ValueOrder order) {
   }
 
   private static boolean isFilterSet(String filter) {
-    return StringUtils.isNotBlank(filter) && !filter.equalsIgnoreCase(".*");
+    return filter != null && !filter.isBlank() && !filter.equalsIgnoreCase(".*");
   }
 
   private static boolean isOrderSet(ValueOrder order) {
diff --git a/src/main/java/io/jenkins/plugins/restlistparam/util/CredentialsUtils.java b/src/main/java/io/jenkins/plugins/restlistparam/util/CredentialsUtils.java
index 1f5de8e..dd4dda5 100644
--- a/src/main/java/io/jenkins/plugins/restlistparam/util/CredentialsUtils.java
+++ b/src/main/java/io/jenkins/plugins/restlistparam/util/CredentialsUtils.java
@@ -14,7 +14,7 @@
 import hudson.util.ListBoxModel;
 import io.jenkins.plugins.restlistparam.Messages;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
+
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 
 import java.util.Collections;
@@ -65,7 +65,7 @@ public static FormValidation doCheckCredentialsId(final Item context,
       return FormValidation.ok();
     }
 
-    if (StringUtils.isBlank(credentialsId)) {
+    if (credentialsId == null || credentialsId.isBlank()) {
       return FormValidation.ok();
     }
     if (credentialsId.startsWith("${") && credentialsId.endsWith("}")) {
@@ -80,7 +80,7 @@ public static FormValidation doCheckCredentialsId(final Item context,
   public static Optional<StandardCredentials> findCredentials(final Item context,
                                                               final String credentialsId)
   {
-    if (StringUtils.isBlank(credentialsId)) {
+    if (credentialsId == null || credentialsId.isBlank()) {
       return Optional.empty();
     }
     List<StandardCredentials> lookupCredentials = CredentialsProvider.lookupCredentials(