Skip to content

Commit 749f968

Browse files
authored
Upgrade Commons Lang from 2 to 3 (#340)
1 parent 825dce7 commit 749f968

File tree

14 files changed

+19
-15
lines changed

14 files changed

+19
-15
lines changed

pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@
9494
<groupId>io.jenkins.plugins</groupId>
9595
<artifactId>asm-api</artifactId>
9696
</dependency>
97+
<dependency>
98+
<groupId>io.jenkins.plugins</groupId>
99+
<artifactId>commons-lang3-api</artifactId>
100+
</dependency>
97101
<dependency>
98102
<groupId>org.jenkins-ci.plugins</groupId>
99103
<artifactId>structs</artifactId>

src/main/java/jenkins/scm/api/MethodUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import java.util.Arrays;
3131
import java.util.List;
3232
import edu.umd.cs.findbugs.annotations.NonNull;
33-
import org.apache.commons.lang.ClassUtils;
34-
import org.apache.commons.lang.Validate;
33+
import org.apache.commons.lang3.ClassUtils;
34+
import org.apache.commons.lang3.Validate;
3535

3636
/**
3737
* Helper to identify methods that have not been implemented / overridden.

src/main/java/jenkins/scm/api/SCMCategory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import java.util.Set;
3939
import java.util.TreeMap;
4040
import java.util.TreeSet;
41-
import org.apache.commons.lang.StringUtils;
41+
import org.apache.commons.lang3.StringUtils;
4242
import org.jvnet.localizer.Localizable;
4343

4444
/**

src/main/java/jenkins/scm/api/SCMEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import jakarta.servlet.http.HttpServletRequest;
5050
import jenkins.security.ImpersonatingScheduledExecutorService;
5151
import jenkins.util.SystemProperties;
52-
import org.apache.commons.lang.StringUtils;
52+
import org.apache.commons.lang3.StringUtils;
5353
import org.kohsuke.accmod.Restricted;
5454
import org.kohsuke.accmod.restrictions.NoExternalUse;
5555
import org.kohsuke.stapler.Stapler;

src/main/java/jenkins/scm/api/SCMFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import java.util.Collections;
3535
import java.util.List;
3636
import org.apache.commons.io.IOUtils;
37-
import org.apache.commons.lang.StringUtils;
37+
import org.apache.commons.lang3.StringUtils;
3838
import org.kohsuke.stapler.WebApp;
3939

4040
/**

src/main/java/jenkins/scm/api/SCMHeadMixinEqualityGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import java.util.concurrent.locks.ReentrantReadWriteLock;
4242
import jenkins.scm.api.mixin.SCMHeadMixin;
4343
import net.jcip.annotations.GuardedBy;
44-
import org.apache.commons.lang.ClassUtils;
44+
import org.apache.commons.lang3.ClassUtils;
4545
import org.objectweb.asm.ClassWriter;
4646
import org.objectweb.asm.Label;
4747
import org.objectweb.asm.MethodVisitor;
@@ -175,7 +175,7 @@ private SCMHeadMixinEqualityGenerator(ClassLoader parent) {
175175
@NonNull
176176
private SCMHeadMixin.Equality create(@NonNull Class<? extends SCMHead> type) {
177177
Map<String, Method> properties = new TreeMap<>();
178-
for (Class clazz : (List<Class>) ClassUtils.getAllInterfaces(type)) {
178+
for (Class clazz : ClassUtils.getAllInterfaces(type)) {
179179
if (!SCMHeadMixin.class.isAssignableFrom(clazz)) {
180180
// not a mix-in
181181
continue;

src/main/java/jenkins/scm/api/SCMName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import java.util.List;
3838
import java.util.Locale;
3939

40-
import org.apache.commons.lang.StringUtils;
40+
import org.apache.commons.lang3.StringUtils;
4141

4242
/**
4343
* Utility class to help with naming SCM related things.

src/main/java/jenkins/scm/api/metadata/AvatarMetadataAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import jenkins.scm.api.SCMSource;
3636
import jenkins.scm.impl.avatars.AvatarCache;
3737
import org.apache.commons.jelly.JellyContext;
38-
import org.apache.commons.lang.StringUtils;
38+
import org.apache.commons.lang3.StringUtils;
3939
import org.jenkins.ui.icon.Icon;
4040
import org.jenkins.ui.icon.IconSet;
4141
import org.jenkins.ui.icon.IconSpec;

src/main/java/jenkins/scm/impl/avatars/AvatarCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import jakarta.servlet.http.HttpServletResponse;
6161
import jenkins.model.Jenkins;
6262

63-
import org.apache.commons.lang.StringUtils;
63+
import org.apache.commons.lang3.StringUtils;
6464
import org.kohsuke.stapler.HttpResponse;
6565
import org.kohsuke.stapler.QueryParameter;
6666
import org.kohsuke.stapler.StaplerRequest2;

src/main/java/jenkins/scm/impl/trait/WildcardSCMHeadFilterTrait.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import jenkins.scm.api.trait.SCMSourceContext;
3535
import jenkins.scm.api.trait.SCMSourceTrait;
3636
import jenkins.scm.api.trait.SCMSourceTraitDescriptor;
37-
import org.apache.commons.lang.StringUtils;
37+
import org.apache.commons.lang3.StringUtils;
3838
import org.jenkinsci.Symbol;
3939
import org.kohsuke.stapler.DataBoundConstructor;
4040

0 commit comments

Comments
 (0)