Skip to content

Commit 04e86c7

Browse files
authored
Migrate from Commons Lang 2 to Commons Lang 3 (#542)
1 parent 2dc2c4b commit 04e86c7

11 files changed

+14
-10
lines changed

pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@
101101
<groupId>io.jenkins.plugins</groupId>
102102
<artifactId>caffeine-api</artifactId>
103103
</dependency>
104+
<dependency>
105+
<groupId>io.jenkins.plugins</groupId>
106+
<artifactId>commons-lang3-api</artifactId>
107+
</dependency>
104108
<dependency>
105109
<groupId>io.jenkins.plugins</groupId>
106110
<artifactId>ionicons-api</artifactId>

src/main/java/jenkins/branch/BranchEventCause.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import hudson.model.Run;
3333
import java.util.Date;
3434
import jenkins.scm.api.SCMEvent;
35-
import org.apache.commons.lang.StringUtils;
35+
import org.apache.commons.lang3.StringUtils;
3636
import org.kohsuke.accmod.Restricted;
3737
import org.kohsuke.accmod.restrictions.DoNotUse;
3838

src/main/java/jenkins/branch/DescriptionColumn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import java.io.IOException;
3737
import jenkins.model.Jenkins;
3838
import jenkins.scm.api.metadata.ObjectMetadataAction;
39-
import org.apache.commons.lang.StringUtils;
39+
import org.apache.commons.lang3.StringUtils;
4040
import org.kohsuke.accmod.Restricted;
4141
import org.kohsuke.accmod.restrictions.NoExternalUse;
4242
import org.kohsuke.stapler.DataBoundConstructor;

src/main/java/jenkins/branch/ItemColumn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import hudson.views.ListViewColumnDescriptor;
3939
import jenkins.scm.api.metadata.ObjectMetadataAction;
4040
import jenkins.scm.api.metadata.PrimaryInstanceMetadataAction;
41-
import org.apache.commons.lang.StringUtils;
41+
import org.apache.commons.lang3.StringUtils;
4242
import org.kohsuke.accmod.Restricted;
4343
import org.kohsuke.accmod.restrictions.NoExternalUse;
4444
import org.kohsuke.stapler.DataBoundConstructor;

src/main/java/jenkins/branch/MultiBranchProject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
import jenkins.util.SystemProperties;
108108
import net.sf.json.JSONObject;
109109
import org.apache.commons.io.FileUtils;
110-
import org.apache.commons.lang.StringUtils;
110+
import org.apache.commons.lang3.StringUtils;
111111
import org.jenkins.ui.icon.IconSpec;
112112
import org.kohsuke.accmod.Restricted;
113113
import org.kohsuke.accmod.restrictions.NoExternalUse;

src/main/java/jenkins/branch/MultiBranchProjectDisplayNamingStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.jvnet.localizer.Localizable;
3030

3131
import static java.lang.String.format;
32-
import static org.apache.commons.lang.StringUtils.isBlank;
32+
import static org.apache.commons.lang3.StringUtils.isBlank;
3333

3434
/**
3535
* Possible Display naming strategies.

src/main/java/jenkins/branch/NameMangler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.security.MessageDigest;
2828
import java.security.NoSuchAlgorithmException;
2929
import java.util.Locale;
30-
import org.apache.commons.lang.StringUtils;
30+
import org.apache.commons.lang3.StringUtils;
3131

3232
/**
3333
* Mangles names that are not nice so that they are safe to use on filesystem.

src/main/java/jenkins/branch/NamedExceptionsBranchPropertyStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import hudson.model.AbstractDescribableImpl;
3131
import hudson.model.Descriptor;
3232
import jenkins.scm.api.SCMHead;
33-
import org.apache.commons.lang.StringUtils;
33+
import org.apache.commons.lang3.StringUtils;
3434
import org.apache.tools.ant.types.selectors.SelectorUtils;
3535
import org.jenkinsci.Symbol;
3636
import org.kohsuke.stapler.DataBoundConstructor;

src/main/java/jenkins/branch/OrganizationFolder.java

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

9696
import java.nio.charset.StandardCharsets;
9797
import org.apache.commons.io.FileUtils;
98-
import org.apache.commons.lang.StringUtils;
98+
import org.apache.commons.lang3.StringUtils;
9999
import org.jenkins.ui.icon.Icon;
100100
import org.jenkins.ui.icon.IconSet;
101101
import org.jenkins.ui.icon.IconSpec;

src/main/java/jenkins/branch/WorkspaceLocatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
import jenkins.util.ErrorLoggingExecutorService;
8585
import jenkins.util.SystemProperties;
8686
import org.apache.commons.codec.binary.Base32;
87-
import org.apache.commons.lang.StringUtils;
87+
import org.apache.commons.lang3.StringUtils;
8888
import org.kohsuke.accmod.Restricted;
8989
import org.kohsuke.accmod.restrictions.NoExternalUse;
9090

0 commit comments

Comments
 (0)