Skip to content

Commit 45107b6

Browse files
authored
Merge pull request #1151 from jonesbusy/plugin-modernizer/migratecommonslang2tolang3andcommontext
Migrate Commons Lang from 2 to 3
2 parents 12134bb + f28174b commit 45107b6

19 files changed

+22
-21
lines changed

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
6060
<spotless.check.skip>false</spotless.check.skip>
6161
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
62+
<ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
6263
</properties>
6364

6465
<dependencyManagement>

src/main/java/com/atlassian/httpclient/apache/httpcomponents/ApacheAsyncHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import javax.net.ssl.SSLSession;
4040
import javax.net.ssl.SSLSocket;
4141
import jenkins.model.Jenkins;
42-
import org.apache.commons.lang.StringUtils;
42+
import org.apache.commons.lang3.StringUtils;
4343
import org.apache.http.Header;
4444
import org.apache.http.HttpEntity;
4545
import org.apache.http.HttpException;

src/main/java/hudson/plugins/jira/CredentialsHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.logging.Level;
2828
import java.util.logging.Logger;
2929
import jenkins.model.Jenkins;
30-
import org.apache.commons.lang.StringUtils;
30+
import org.apache.commons.lang3.StringUtils;
3131

3232
/**
3333
* Helper class for vary credentials operations.

src/main/java/hudson/plugins/jira/JiraChangeLogAnnotator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.logging.Logger;
1818
import java.util.regex.Matcher;
1919
import java.util.regex.Pattern;
20-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.StringUtils;
2121

2222
/**
2323
* {@link ChangeLogAnnotator} that picks up Jira issue IDs.

src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import java.util.logging.Logger;
3737
import java.util.stream.Collectors;
3838
import net.sf.json.JSONObject;
39-
import org.apache.commons.lang.StringUtils;
39+
import org.apache.commons.lang3.StringUtils;
4040
import org.kohsuke.stapler.AncestorInPath;
4141
import org.kohsuke.stapler.DataBoundConstructor;
4242
import org.kohsuke.stapler.QueryParameter;

src/main/java/hudson/plugins/jira/JiraCreateReleaseNotes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package hudson.plugins.jira;
22

3-
import static org.apache.commons.lang.StringUtils.defaultIfEmpty;
4-
import static org.apache.commons.lang.StringUtils.isEmpty;
3+
import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
4+
import static org.apache.commons.lang3.StringUtils.isEmpty;
55

66
import hudson.EnvVars;
77
import hudson.Extension;

src/main/java/hudson/plugins/jira/JiraEnvironmentVariableBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.io.IOException;
1414
import java.util.Set;
1515
import jenkins.model.Jenkins;
16-
import org.apache.commons.lang.StringUtils;
16+
import org.apache.commons.lang3.StringUtils;
1717
import org.kohsuke.stapler.DataBoundConstructor;
1818

1919
/**

src/main/java/hudson/plugins/jira/JiraIssueUpdateBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import hudson.util.FormValidation;
2727
import java.io.IOException;
2828
import jenkins.tasks.SimpleBuildStep;
29-
import org.apache.commons.lang.StringUtils;
29+
import org.apache.commons.lang3.StringUtils;
3030
import org.jenkinsci.Symbol;
3131
import org.kohsuke.stapler.DataBoundConstructor;
3232
import org.kohsuke.stapler.QueryParameter;

src/main/java/hudson/plugins/jira/JiraRestService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
import java.util.stream.StreamSupport;
7272
import jenkins.model.Jenkins;
7373
import org.apache.commons.codec.binary.Base64;
74-
import org.apache.commons.lang.StringUtils;
74+
import org.apache.commons.lang3.StringUtils;
7575
import org.apache.http.HttpHost;
7676
import org.apache.http.client.fluent.Content;
7777
import org.apache.http.client.fluent.Request;

src/main/java/hudson/plugins/jira/JiraSession.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package hudson.plugins.jira;
22

3-
import static org.apache.commons.lang.StringUtils.isNotEmpty;
3+
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
44

55
import com.atlassian.jira.rest.client.api.RestClientException;
66
import com.atlassian.jira.rest.client.api.domain.BasicIssue;
@@ -28,7 +28,7 @@
2828
import java.util.logging.Logger;
2929
import java.util.regex.Matcher;
3030
import java.util.regex.Pattern;
31-
import org.apache.commons.lang.StringUtils;
31+
import org.apache.commons.lang3.StringUtils;
3232

3333
/**
3434
* Connection to Jira.

0 commit comments

Comments
 (0)