diff --git a/pom.xml b/pom.xml
index 947021a1..9448bc41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>5.2102.v5f5fe09fccf1</version>
+        <version>6.2116.v7501b_67dc517</version>
         <relativePath />
     </parent>
 
@@ -34,6 +34,7 @@
         <hpi.bundledArtifacts>commons-digester,commons-validator</hpi.bundledArtifacts>
         <hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
         <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
+        <ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
     </properties>
 
     <dependencyManagement>
@@ -68,6 +69,10 @@
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>apache-httpcomponents-client-5-api</artifactId>
         </dependency>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>gson-api</artifactId>
diff --git a/src/main/java/jenkins/plugins/office365connector/ActionableBuilder.java b/src/main/java/jenkins/plugins/office365connector/ActionableBuilder.java
index 49340862..97d2900b 100644
--- a/src/main/java/jenkins/plugins/office365connector/ActionableBuilder.java
+++ b/src/main/java/jenkins/plugins/office365connector/ActionableBuilder.java
@@ -26,7 +26,7 @@
 import jenkins.scm.api.metadata.ContributorMetadataAction;
 import jenkins.scm.api.metadata.ObjectMetadataAction;
 import jenkins.scm.api.mixin.ChangeRequestSCMHead;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
 
 /**
diff --git a/src/main/java/jenkins/plugins/office365connector/FactsBuilder.java b/src/main/java/jenkins/plugins/office365connector/FactsBuilder.java
index 00f44af7..bb8d84d4 100644
--- a/src/main/java/jenkins/plugins/office365connector/FactsBuilder.java
+++ b/src/main/java/jenkins/plugins/office365connector/FactsBuilder.java
@@ -32,7 +32,7 @@
 import jenkins.plugins.office365connector.model.Fact;
 import jenkins.plugins.office365connector.model.FactDefinition;
 import jenkins.scm.RunWithSCM;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
 import org.jenkinsci.plugins.tokenmacro.TokenMacro;
 
diff --git a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
index 667a2a39..bda94855 100644
--- a/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
+++ b/src/main/java/jenkins/plugins/office365connector/HttpWorker.java
@@ -24,7 +24,7 @@
 import java.util.regex.Pattern;
 
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
diff --git a/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java b/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
index 73c2f2d2..626d8332 100644
--- a/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
+++ b/src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java
@@ -29,7 +29,7 @@
 import hudson.model.TaskListener;
 import jenkins.plugins.office365connector.model.Card;
 import jenkins.plugins.office365connector.workflow.StepParameters;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author srhebbar
diff --git a/src/main/java/jenkins/plugins/office365connector/Webhook.java b/src/main/java/jenkins/plugins/office365connector/Webhook.java
index e629c8b7..e3714ebb 100644
--- a/src/main/java/jenkins/plugins/office365connector/Webhook.java
+++ b/src/main/java/jenkins/plugins/office365connector/Webhook.java
@@ -27,7 +27,7 @@
 import jenkins.plugins.office365connector.model.Macro;
 import jenkins.plugins.office365connector.utils.FormUtils;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
diff --git a/src/main/java/jenkins/plugins/office365connector/utils/FormUtils.java b/src/main/java/jenkins/plugins/office365connector/utils/FormUtils.java
index 577971b4..fb4ff90c 100644
--- a/src/main/java/jenkins/plugins/office365connector/utils/FormUtils.java
+++ b/src/main/java/jenkins/plugins/office365connector/utils/FormUtils.java
@@ -1,7 +1,7 @@
 package jenkins.plugins.office365connector.utils;
 
 import hudson.util.FormValidation;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.routines.UrlValidator;
 
 /**
diff --git a/src/test/java/jenkins/plugins/office365connector/ActionableBuilderTest.java b/src/test/java/jenkins/plugins/office365connector/ActionableBuilderTest.java
index ad386f95..0280363a 100644
--- a/src/test/java/jenkins/plugins/office365connector/ActionableBuilderTest.java
+++ b/src/test/java/jenkins/plugins/office365connector/ActionableBuilderTest.java
@@ -9,7 +9,7 @@
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.metadata.ContributorMetadataAction;
 import jenkins.scm.api.metadata.ObjectMetadataAction;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/jenkins/plugins/office365connector/CardBuilderMessageCardTest.java b/src/test/java/jenkins/plugins/office365connector/CardBuilderMessageCardTest.java
index c31d2ea3..a3c84d29 100644
--- a/src/test/java/jenkins/plugins/office365connector/CardBuilderMessageCardTest.java
+++ b/src/test/java/jenkins/plugins/office365connector/CardBuilderMessageCardTest.java
@@ -11,7 +11,7 @@
 import jenkins.plugins.office365connector.model.Section;
 import jenkins.plugins.office365connector.workflow.AbstractTest;
 import jenkins.plugins.office365connector.workflow.StepParameters;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/jenkins/plugins/office365connector/FactsBuilderTest.java b/src/test/java/jenkins/plugins/office365connector/FactsBuilderTest.java
index 52fa7ac5..b348bd15 100644
--- a/src/test/java/jenkins/plugins/office365connector/FactsBuilderTest.java
+++ b/src/test/java/jenkins/plugins/office365connector/FactsBuilderTest.java
@@ -10,7 +10,7 @@
 import jenkins.plugins.office365connector.model.Fact;
 import jenkins.plugins.office365connector.model.FactDefinition;
 import jenkins.plugins.office365connector.workflow.AbstractTest;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/jenkins/plugins/office365connector/helpers/ReflectionHelper.java b/src/test/java/jenkins/plugins/office365connector/helpers/ReflectionHelper.java
index 2818e605..7ce541ae 100644
--- a/src/test/java/jenkins/plugins/office365connector/helpers/ReflectionHelper.java
+++ b/src/test/java/jenkins/plugins/office365connector/helpers/ReflectionHelper.java
@@ -1,7 +1,7 @@
 package jenkins.plugins.office365connector.helpers;
 
 import hudson.util.ReflectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/src/test/java/jenkins/plugins/office365connector/helpers/SCMHeadBuilder.java b/src/test/java/jenkins/plugins/office365connector/helpers/SCMHeadBuilder.java
index 98f51489..c0d83fb9 100644
--- a/src/test/java/jenkins/plugins/office365connector/helpers/SCMHeadBuilder.java
+++ b/src/test/java/jenkins/plugins/office365connector/helpers/SCMHeadBuilder.java
@@ -3,7 +3,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.mixin.ChangeRequestSCMHead;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 
 /**
  * @author Damian Szczepanik (damianszczepanik@github)
diff --git a/src/test/java/jenkins/plugins/office365connector/workflow/AbstractTest.java b/src/test/java/jenkins/plugins/office365connector/workflow/AbstractTest.java
index ea75b2a1..fe1f8dbb 100644
--- a/src/test/java/jenkins/plugins/office365connector/workflow/AbstractTest.java
+++ b/src/test/java/jenkins/plugins/office365connector/workflow/AbstractTest.java
@@ -15,7 +15,7 @@
 import jenkins.plugins.office365connector.WebhookJobProperty;
 import jenkins.plugins.office365connector.helpers.ClassicDisplayURLProviderBuilder;
 import jenkins.plugins.office365connector.helpers.WebhookBuilder;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
 import org.jenkinsci.plugins.tokenmacro.TokenMacro;
 import org.junit.jupiter.api.AfterEach;