Skip to content

Commit 39f3fb8

Browse files
committed
Migrate Commons Lang from 2 to 3
1 parent e70d2a6 commit 39f3fb8

24 files changed

Lines changed: 33 additions & 28 deletions

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>6.2111.v8b_6a_1d599df3</version>
7+
<version>6.2116.v7501b_67dc517</version>
88
<relativePath />
99
</parent>
1010

@@ -51,6 +51,7 @@
5151
<spotbugs.effort>Max</spotbugs.effort>
5252
<spotbugs.threshold>Low</spotbugs.threshold>
5353
<spotless.check.skip>false</spotless.check.skip>
54+
<ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
5455
</properties>
5556

5657
<dependencyManagement>
@@ -76,6 +77,10 @@
7677
<groupId>io.jenkins.plugins</groupId>
7778
<artifactId>caffeine-api</artifactId>
7879
</dependency>
80+
<dependency>
81+
<groupId>io.jenkins.plugins</groupId>
82+
<artifactId>commons-lang3-api</artifactId>
83+
</dependency>
7984
<dependency>
8085
<groupId>org.jenkins-ci.plugins</groupId>
8186
<artifactId>authentication-tokens</artifactId>

src/main/java/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.Objects;
1717
import java.util.TreeMap;
1818
import jenkins.model.Jenkins;
19-
import org.apache.commons.lang.StringUtils;
19+
import org.apache.commons.lang3.StringUtils;
2020
import org.csanchez.jenkins.plugins.kubernetes.model.TemplateEnvVar;
2121
import org.jenkinsci.Symbol;
2222
import org.kohsuke.accmod.Restricted;

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java

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

33
import static java.nio.charset.StandardCharsets.UTF_8;
4-
import static org.apache.commons.lang.StringUtils.isEmpty;
4+
import static org.apache.commons.lang3.StringUtils.isEmpty;
55
import static org.csanchez.jenkins.plugins.kubernetes.PodTemplateUtils.sanitizeLabel;
66

77
import com.cloudbees.plugins.credentials.CredentialsMatchers;
@@ -76,7 +76,7 @@
7676
import jenkins.util.SystemProperties;
7777
import jenkins.websocket.WebSockets;
7878
import net.sf.json.JSONObject;
79-
import org.apache.commons.lang.StringUtils;
79+
import org.apache.commons.lang3.StringUtils;
8080
import org.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateMap;
8181
import org.csanchez.jenkins.plugins.kubernetes.pod.retention.Default;
8282
import org.csanchez.jenkins.plugins.kubernetes.pod.retention.PodRetention;

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesComputer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.util.logging.Logger;
3030
import jenkins.model.Jenkins;
3131
import org.acegisecurity.Authentication;
32-
import org.apache.commons.lang.StringUtils;
32+
import org.apache.commons.lang3.StringUtils;
3333
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException;
3434
import org.kohsuke.stapler.QueryParameter;
3535
import org.kohsuke.stapler.StaplerRequest2;

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.logging.Logger;
2525
import jenkins.authentication.tokens.api.AuthenticationTokens;
2626
import jenkins.model.Jenkins;
27-
import org.apache.commons.lang.StringUtils;
27+
import org.apache.commons.lang3.StringUtils;
2828
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuth;
2929
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
3030
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException;

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import java.util.stream.Collectors;
5656
import jenkins.metrics.api.Metrics;
5757
import jenkins.util.SystemProperties;
58-
import org.apache.commons.lang.StringUtils;
58+
import org.apache.commons.lang3.StringUtils;
5959
import org.csanchez.jenkins.plugins.kubernetes.pod.decorator.PodDecoratorException;
6060
import org.csanchez.jenkins.plugins.kubernetes.pod.retention.Reaper;
6161
import org.kohsuke.stapler.DataBoundConstructor;

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
import jenkins.metrics.api.Metrics;
4747
import jenkins.model.Jenkins;
4848
import jenkins.security.MasterToSlaveCallable;
49-
import org.apache.commons.lang.StringUtils;
50-
import org.apache.commons.lang.Validate;
49+
import org.apache.commons.lang3.StringUtils;
50+
import org.apache.commons.lang3.Validate;
5151
import org.csanchez.jenkins.plugins.kubernetes.pod.retention.PodRetention;
5252
import org.jenkinsci.plugins.durabletask.executors.OnceRetentionStrategy;
5353
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException;

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodContainerSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.List;
1313
import java.util.Objects;
1414
import java.util.Optional;
15-
import org.apache.commons.lang.StringUtils;
15+
import org.apache.commons.lang3.StringUtils;
1616

1717
/**
1818
* Pod container sources are responsible to locating details about Pod containers.

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodLabel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.List;
1414
import java.util.Map;
1515
import java.util.Objects;
16-
import org.apache.commons.lang.Validate;
16+
import org.apache.commons.lang3.Validate;
1717
import org.jenkinsci.Symbol;
1818
import org.kohsuke.stapler.DataBoundConstructor;
1919

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import java.util.logging.Logger;
4040
import jenkins.model.Jenkins;
4141
import net.sf.json.JSONObject;
42-
import org.apache.commons.lang.StringUtils;
42+
import org.apache.commons.lang3.StringUtils;
4343
import org.csanchez.jenkins.plugins.kubernetes.model.TemplateEnvVar;
4444
import org.csanchez.jenkins.plugins.kubernetes.pod.retention.PodRetention;
4545
import org.csanchez.jenkins.plugins.kubernetes.pod.yaml.YamlMergeStrategy;

0 commit comments

Comments
 (0)