From cbb37190d1a9010ad3e373329f04ada733217ef9 Mon Sep 17 00:00:00 2001
From: Valentin Delaye <jonesbusy@users.noreply.github.com>
Date: Thu, 15 Jan 2026 15:44:04 +0100
Subject: [PATCH] Migrate Commons Lang from 2 to 3

---
 pom.xml                                                      | 5 +++++
 .../plugins/docker/workflow/client/DockerClient.java         | 2 +-
 .../docker/workflow/declarative/DeclarativeDockerUtils.java  | 2 +-
 .../plugins/docker/workflow/declarative/DockerPipeline.java  | 2 +-
 .../workflow/declarative/DockerPipelineFromDockerfile.java   | 2 +-
 .../plugins/docker/workflow/declarative/FolderConfig.java    | 2 +-
 .../plugins/docker/workflow/declarative/GlobalConfig.java    | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 420979c4a..2e1cfa1e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
         <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <useBeta>true</useBeta>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
+        <ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
     </properties>
     <repositories>
         <repository>
@@ -72,6 +73,10 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>docker-commons</artifactId>
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java
index b36b6fd91..49055e943 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java
@@ -57,7 +57,7 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.docker.commons.fingerprint.ContainerRecord;
 import org.jenkinsci.plugins.docker.commons.tools.DockerTool;
 import org.kohsuke.accmod.Restricted;
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DeclarativeDockerUtils.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DeclarativeDockerUtils.java
index b680cd371..f04c5167a 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DeclarativeDockerUtils.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DeclarativeDockerUtils.java
@@ -26,7 +26,7 @@
 
 import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.model.Run;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.pipeline.modeldefinition.agent.impl.Label;
 import org.jenkinsci.plugins.pipeline.modeldefinition.withscript.WithScriptScript;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted;
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipeline.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipeline.java
index db592ea49..27a31ab47 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipeline.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipeline.java
@@ -28,7 +28,7 @@
 import hudson.Extension;
 import hudson.Util;
 import hudson.util.FormValidation;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgentDescriptor;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipelineFromDockerfile.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipelineFromDockerfile.java
index 89f60395c..2919f3bac 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipelineFromDockerfile.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipelineFromDockerfile.java
@@ -27,7 +27,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgentDescriptor;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/FolderConfig.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/FolderConfig.java
index 3bfeb21c4..cf419cb64 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/FolderConfig.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/FolderConfig.java
@@ -36,7 +36,7 @@
 import hudson.model.Items;
 import hudson.model.Job;
 import hudson.model.Run;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryEndpoint;
 import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/GlobalConfig.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/GlobalConfig.java
index 7099f423f..01781e1e2 100644
--- a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/GlobalConfig.java
+++ b/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/GlobalConfig.java
@@ -40,7 +40,7 @@
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryEndpoint;
 import org.kohsuke.stapler.DataBoundSetter;