Skip to content

Commit 9f1f6ae

Browse files
committed
Migrate Commons Lang from 2 to 3
1 parent 049bccf commit 9f1f6ae

File tree

13 files changed

+18
-13
lines changed

13 files changed

+18
-13
lines changed

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

@@ -34,6 +34,7 @@
3434
<hpi.bundledArtifacts>commons-digester,commons-validator</hpi.bundledArtifacts>
3535
<hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
3636
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
37+
<ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
3738
</properties>
3839

3940
<dependencyManagement>
@@ -68,6 +69,10 @@
6869
<groupId>io.jenkins.plugins</groupId>
6970
<artifactId>apache-httpcomponents-client-5-api</artifactId>
7071
</dependency>
72+
<dependency>
73+
<groupId>io.jenkins.plugins</groupId>
74+
<artifactId>commons-lang3-api</artifactId>
75+
</dependency>
7176
<dependency>
7277
<groupId>io.jenkins.plugins</groupId>
7378
<artifactId>gson-api</artifactId>

src/main/java/jenkins/plugins/office365connector/ActionableBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import jenkins.scm.api.metadata.ContributorMetadataAction;
2727
import jenkins.scm.api.metadata.ObjectMetadataAction;
2828
import jenkins.scm.api.mixin.ChangeRequestSCMHead;
29-
import org.apache.commons.lang.StringUtils;
29+
import org.apache.commons.lang3.StringUtils;
3030
import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
3131

3232
/**

src/main/java/jenkins/plugins/office365connector/FactsBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import jenkins.plugins.office365connector.model.Fact;
3333
import jenkins.plugins.office365connector.model.FactDefinition;
3434
import jenkins.scm.RunWithSCM;
35-
import org.apache.commons.lang.StringUtils;
35+
import org.apache.commons.lang3.StringUtils;
3636
import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
3737
import org.jenkinsci.plugins.tokenmacro.TokenMacro;
3838

src/main/java/jenkins/plugins/office365connector/HttpWorker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.regex.Pattern;
2525

2626
import jenkins.model.Jenkins;
27-
import org.apache.commons.lang.StringUtils;
27+
import org.apache.commons.lang3.StringUtils;
2828
import org.apache.hc.client5.http.config.ConnectionConfig;
2929
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
3030
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;

src/main/java/jenkins/plugins/office365connector/Office365ConnectorWebhookNotifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import hudson.model.TaskListener;
3030
import jenkins.plugins.office365connector.model.Card;
3131
import jenkins.plugins.office365connector.workflow.StepParameters;
32-
import org.apache.commons.lang.StringUtils;
32+
import org.apache.commons.lang3.StringUtils;
3333

3434
/**
3535
* @author srhebbar

src/main/java/jenkins/plugins/office365connector/Webhook.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import jenkins.plugins.office365connector.model.Macro;
2828
import jenkins.plugins.office365connector.utils.FormUtils;
2929
import net.sf.json.JSONObject;
30-
import org.apache.commons.lang.StringUtils;
30+
import org.apache.commons.lang3.StringUtils;
3131
import org.kohsuke.stapler.DataBoundConstructor;
3232
import org.kohsuke.stapler.DataBoundSetter;
3333
import org.kohsuke.stapler.QueryParameter;

src/main/java/jenkins/plugins/office365connector/utils/FormUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package jenkins.plugins.office365connector.utils;
22

33
import hudson.util.FormValidation;
4-
import org.apache.commons.lang.StringUtils;
4+
import org.apache.commons.lang3.StringUtils;
55
import org.apache.commons.validator.routines.UrlValidator;
66

77
/**

src/test/java/jenkins/plugins/office365connector/ActionableBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import jenkins.scm.api.SCMHead;
1010
import jenkins.scm.api.metadata.ContributorMetadataAction;
1111
import jenkins.scm.api.metadata.ObjectMetadataAction;
12-
import org.apache.commons.lang.StringUtils;
12+
import org.apache.commons.lang3.StringUtils;
1313
import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
1414
import org.junit.jupiter.api.AfterEach;
1515
import org.junit.jupiter.api.BeforeEach;

src/test/java/jenkins/plugins/office365connector/CardBuilderMessageCardTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import jenkins.plugins.office365connector.model.Section;
1212
import jenkins.plugins.office365connector.workflow.AbstractTest;
1313
import jenkins.plugins.office365connector.workflow.StepParameters;
14-
import org.apache.commons.lang.StringUtils;
14+
import org.apache.commons.lang3.StringUtils;
1515
import org.junit.jupiter.api.BeforeEach;
1616
import org.junit.jupiter.api.Test;
1717

src/test/java/jenkins/plugins/office365connector/FactsBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import jenkins.plugins.office365connector.model.Fact;
1111
import jenkins.plugins.office365connector.model.FactDefinition;
1212
import jenkins.plugins.office365connector.workflow.AbstractTest;
13-
import org.apache.commons.lang.StringUtils;
13+
import org.apache.commons.lang3.StringUtils;
1414
import org.junit.jupiter.api.BeforeEach;
1515
import org.junit.jupiter.api.Test;
1616

0 commit comments

Comments
 (0)