Skip to content

Commit 1e30290

Browse files
jonesbusyValentin Delaye
authored andcommitted
Migrate Commons Lang from 2 to 3
1 parent 4e57ee5 commit 1e30290

7 files changed

Lines changed: 12 additions & 7 deletions

File tree

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>5.2102.v5f5fe09fccf1</version>
7+
<version>6.2116.v7501b_67dc517</version>
88
<relativePath/>
99
</parent>
1010
<artifactId>docker-workflow</artifactId>
@@ -35,6 +35,7 @@
3535
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
3636
<useBeta>true</useBeta>
3737
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
38+
<ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
3839
</properties>
3940
<repositories>
4041
<repository>
@@ -72,6 +73,10 @@
7273
</dependencies>
7374
</dependencyManagement>
7475
<dependencies>
76+
<dependency>
77+
<groupId>io.jenkins.plugins</groupId>
78+
<artifactId>commons-lang3-api</artifactId>
79+
</dependency>
7580
<dependency>
7681
<groupId>org.jenkins-ci.plugins</groupId>
7782
<artifactId>docker-commons</artifactId>

src/main/java/org/jenkinsci/plugins/docker/workflow/client/DockerClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import java.util.logging.Logger;
5858
import java.util.regex.Matcher;
5959
import java.util.regex.Pattern;
60-
import org.apache.commons.lang.StringUtils;
60+
import org.apache.commons.lang3.StringUtils;
6161
import org.jenkinsci.plugins.docker.commons.fingerprint.ContainerRecord;
6262
import org.jenkinsci.plugins.docker.commons.tools.DockerTool;
6363
import org.kohsuke.accmod.Restricted;

src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DeclarativeDockerUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import edu.umd.cs.findbugs.annotations.Nullable;
2828
import hudson.model.Run;
29-
import org.apache.commons.lang.StringUtils;
29+
import org.apache.commons.lang3.StringUtils;
3030
import org.jenkinsci.plugins.pipeline.modeldefinition.agent.impl.Label;
3131
import org.jenkinsci.plugins.pipeline.modeldefinition.withscript.WithScriptScript;
3232
import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.Whitelisted;

src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipeline.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import hudson.Extension;
2929
import hudson.Util;
3030
import hudson.util.FormValidation;
31-
import org.apache.commons.lang.StringUtils;
31+
import org.apache.commons.lang3.StringUtils;
3232
import org.jenkinsci.Symbol;
3333
import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgentDescriptor;
3434
import org.kohsuke.stapler.DataBoundConstructor;

src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/DockerPipelineFromDockerfile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import edu.umd.cs.findbugs.annotations.NonNull;
2828
import hudson.Extension;
2929
import org.apache.commons.io.IOUtils;
30-
import org.apache.commons.lang.StringUtils;
30+
import org.apache.commons.lang3.StringUtils;
3131
import org.jenkinsci.Symbol;
3232
import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgentDescriptor;
3333
import org.kohsuke.stapler.DataBoundConstructor;

src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/FolderConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import hudson.model.Items;
3737
import hudson.model.Job;
3838
import hudson.model.Run;
39-
import org.apache.commons.lang.StringUtils;
39+
import org.apache.commons.lang3.StringUtils;
4040
import org.jenkinsci.Symbol;
4141
import org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryEndpoint;
4242
import org.kohsuke.stapler.DataBoundConstructor;

src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/GlobalConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import jenkins.model.Jenkins;
4141
import net.sf.json.JSONObject;
4242
import org.apache.commons.io.FileUtils;
43-
import org.apache.commons.lang.StringUtils;
43+
import org.apache.commons.lang3.StringUtils;
4444
import org.jenkinsci.Symbol;
4545
import org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryEndpoint;
4646
import org.kohsuke.stapler.DataBoundSetter;

0 commit comments

Comments
 (0)