CQI Replace commons-lang deprecated methods (#1120)

nfalco79 · web-flow · commit 88e3abcd6836 · 2025-09-27T12:20:07.000+02:00
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMBuilder.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMBuilder.java
@@ -60,6 +60,7 @@
 import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;
 import jenkins.scm.api.mixin.TagSCMHead;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 /**
  * A {@link GitSCMBuilder} specialized for bitbucket.
@@ -222,7 +223,7 @@ private void withPullRequestRemote(PullRequestSCMHead head, String headName) { /
         String scmSourceRepository = scmSource.getRepository();
         String pullRequestRepoOwner = head.getRepoOwner();
         String pullRequestRepository = head.getRepository();
-        boolean prFromTargetRepository = StringUtils.equalsIgnoreCase(pullRequestRepoOwner, scmSourceRepoOwner)
+        boolean prFromTargetRepository = Strings.CI.equals(pullRequestRepoOwner, scmSourceRepoOwner)
             && pullRequestRepository.equalsIgnoreCase(scmSourceRepository);
         SCMRevision revision = revision();
         ChangeRequestCheckoutStrategy checkoutStrategy = head.getCheckoutStrategy();
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMNavigator.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMNavigator.java
@@ -66,6 +66,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import jenkins.authentication.tokens.api.AuthenticationTokens;
 import jenkins.model.Jenkins;
@@ -218,10 +219,10 @@ public String getServerUrl() {
     }
 
     @DataBoundSetter
-    public void setServerUrl(@CheckForNull String serverUrl) {
-        serverUrl = Util.fixEmpty(URLUtils.normalizeURL(serverUrl));
-        if (serverUrl != null && !StringUtils.equals(this.serverUrl, serverUrl)) {
-            this.serverUrl = serverUrl;
+    public void setServerUrl(@CheckForNull String serverURL) {
+        serverURL = Util.fixEmpty(URLUtils.normalizeURL(serverURL));
+        if (serverURL != null && !Objects.equals(this.serverUrl, serverURL)) {
+            this.serverUrl = serverURL;
             resetId();
         }
     }
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSource.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSource.java
@@ -90,6 +90,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -126,6 +127,7 @@
 import jenkins.scm.impl.trait.Discovery;
 import jenkins.scm.impl.trait.Selection;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.eclipse.jgit.lib.Constants;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
@@ -414,7 +416,7 @@ class Skip extends IOException {
                     pull.getSource().getBranchType() == PullRequestBranchType.TAG ? "tag" : "branch",
                     originalBranchName
             );
-            boolean fork = !StringUtils.equalsIgnoreCase(fullName, pull.getSource().getRepository().getFullName());
+            boolean fork = !Strings.CI.equals(fullName, pull.getSource().getRepository().getFullName());
             String pullRepoOwner = pull.getSource().getRepository().getOwnerName();
             String pullRepository = pull.getSource().getRepository().getRepositoryName();
             final BitbucketApi forkClient = fork && BitbucketApiUtils.isCloud(getServerUrl())
@@ -750,7 +752,7 @@ protected String getProjectKey() {
 
     private void setPrimaryCloneLinks(List<BitbucketHref> links) {
         links.forEach(link -> {
-            if (StringUtils.startsWithIgnoreCase(link.getName(), "http")) {
+            if (Strings.CI.startsWith(link.getName(), "http")) {
                 // Remove the username from URL because it will be set into the GIT_URL variable
                 // credentials used to git clone or push/pull operation could be different than this (for example SSH)
                 // and will run into a failure
@@ -893,9 +895,9 @@ protected List<Action> retrieveActions(@NonNull SCMHead head,
         SCMSourceOwner owner = getOwner();
         if (owner instanceof Actionable actionable) {
             for (BitbucketDefaultBranch p : actionable.getActions(BitbucketDefaultBranch.class)) {
-                if (StringUtils.equalsIgnoreCase(getRepoOwner(), p.getRepoOwner())
-                        && StringUtils.equals(repository, p.getRepository())
-                        && StringUtils.equals(p.getDefaultBranch(), head.getName())) {
+                if (Strings.CI.equals(getRepoOwner(), p.getRepoOwner())
+                        && Objects.equals(repository, p.getRepository())
+                        && Objects.equals(p.getDefaultBranch(), head.getName())) {
                     result.add(new PrimaryInstanceMetadataAction());
                     break;
                 }
@@ -923,7 +925,7 @@ private synchronized Map<String, ContributorMetadataAction> getPullRequestContri
     @NonNull
     public SCMHeadOrigin originOf(@NonNull String repoOwner, @NonNull String repository) {
         if (this.repository.equalsIgnoreCase(repository)) {
-            if (StringUtils.equalsIgnoreCase(this.repoOwner, repoOwner)) {
+            if (Strings.CI.equals(this.repoOwner, repoOwner)) {
                 return SCMHeadOrigin.DEFAULT;
             }
             return new SCMHeadOrigin.Fork(repoOwner);
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/endpoint/BitbucketEndpoint.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/endpoint/BitbucketEndpoint.java
@@ -33,7 +33,7 @@
 import hudson.Util;
 import hudson.model.Describable;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 /**
  * The implementation represents an endpoint configuration to be used in
@@ -156,7 +156,7 @@ default StandardCredentials credentials() {
      * @return {@code true} if endpoint are the same, {@code false} otherwise
      */
     default boolean isEquals(BitbucketEndpoint endpoint) {
-        return StringUtils.equalsIgnoreCase(getServerURL(), endpoint.getServerURL());
+        return Strings.CI.equals(getServerURL(), endpoint.getServerURL());
     }
 
    /**
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/branch/BitbucketCloudBranch.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/branch/BitbucketCloudBranch.java
@@ -136,7 +136,7 @@ private void initHeadCommitInfo() {
         try {
             BitbucketCommit commit = commitClosure.call();
 
-            this.dateInMillis = commit.getDateMillis();
+            this.dateInMillis = commit.getCommitterDate() != null ? commit.getCommitterDate().getTime() : 0;
             this.message = commit.getMessage();
             this.author = commit.getAuthor();
         } catch (Exception e) {
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/events/BitbucketCloudPullRequestEvent.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/events/BitbucketCloudPullRequestEvent.java
@@ -34,7 +34,7 @@
 import com.cloudbees.jenkins.plugins.bitbucket.client.repository.BitbucketCloudRepository;
 import com.cloudbees.jenkins.plugins.bitbucket.client.repository.BitbucketCloudRepositoryOwner;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 public class BitbucketCloudPullRequestEvent implements BitbucketPullRequestEvent {
 
@@ -73,7 +73,7 @@ private void reconstructMissingData() {
                         sourceRepository.setScm(repository.getScm());
                     }
                     if (sourceRepository.getOwner() == null) {
-                        if (!StringUtils.equalsIgnoreCase(sourceRepository.getOwnerName(), repository.getOwnerName())) { // i.e., a fork
+                        if (!Strings.CI.equals(sourceRepository.getOwnerName(), repository.getOwnerName())) { // i.e., a fork
                             BitbucketCloudRepositoryOwner owner = new BitbucketCloudRepositoryOwner();
                             owner.setUsername(sourceRepository.getOwnerName());
                             owner.setDisplayName(this.pullRequest.getAuthorLogin());
@@ -108,7 +108,7 @@ private void reconstructMissingData() {
                     destination.getRepository().setScm(repository.getScm());
                 }
                 if (destination.getRepository().getOwner() == null
-                        && StringUtils.equalsIgnoreCase(destination.getRepository().getOwnerName(), repository.getOwnerName())) {
+                        && Strings.CI.equals(destination.getRepository().getOwnerName(), repository.getOwnerName())) {
                     destination.getRepository().setOwner(repository.getOwner());
                     destination.getRepository().setPrivate(repository.isPrivate());
                 }
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/filesystem/BitbucketSCMFileSystem.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/filesystem/BitbucketSCMFileSystem.java
@@ -62,6 +62,7 @@
 import jenkins.scm.api.SCMSourceDescriptor;
 import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import static org.apache.commons.lang3.StringUtils.defaultString;
 
@@ -276,7 +277,7 @@ public SCMFileSystem build(@NonNull SCMSource source, @NonNull SCMHead head, @Ch
                 if (BitbucketApiUtils.isCloud(serverURL)) {
                     // support lightweight checkout for branches with same owner and repository
                     if (prHead.getCheckoutStrategy() == ChangeRequestCheckoutStrategy.HEAD &&
-                        StringUtils.equalsIgnoreCase(prHead.getRepoOwner(), src.getRepoOwner()) &&
+                            Strings.CI.equals(prHead.getRepoOwner(), src.getRepoOwner()) &&
                         prHead.getRepository().equals(src.getRepository())) {
                         ref = prHead.getOriginName();
                     } else {
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/WebhookAutoRegisterListener.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/WebhookAutoRegisterListener.java
@@ -62,7 +62,7 @@
 import jenkins.scm.api.SCMSourceOwner;
 import jenkins.scm.api.SCMSourceOwners;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
 
 /**
@@ -286,7 +286,7 @@ private boolean isUsedSomewhereElse(SCMSourceOwner owner, String repoOwner, Stri
             if (owner != other) {
                 for(SCMSource otherSource : other.getSCMSources()) {
                     if (otherSource instanceof BitbucketSCMSource bbSCMSource
-                            && StringUtils.equalsIgnoreCase(bbSCMSource.getRepoOwner(), repoOwner)
+                            && Strings.CI.equals(bbSCMSource.getRepoOwner(), repoOwner)
                             && bbSCMSource.getRepository().equals(repoName)) {
                         return true;
                     }
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/AbstractWebhookProcessor.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/AbstractWebhookProcessor.java
@@ -55,6 +55,7 @@
 import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -93,9 +94,9 @@ protected void scmSourceReIndex(final String owner, final String repository, fin
                 for (SCMSource source : sources) {
                     // Search for the correct SCM source
                     if (source instanceof BitbucketSCMSource scmSource
-                            && StringUtils.equalsIgnoreCase(scmSource.getRepoOwner(), owner)
+                            && Strings.CI.equals(scmSource.getRepoOwner(), owner)
                             && scmSource.getRepository().equals(repository)
-                            && (mirrorId == null || StringUtils.equalsIgnoreCase(mirrorId, scmSource.getMirrorId()))) {
+                            && (mirrorId == null || Strings.CI.equals(mirrorId, scmSource.getMirrorId()))) {
                         logger.log(Level.INFO, "Multibranch project found, reindexing {0}", scmOwner.getName());
                         // TODO: SCMSourceOwner.onSCMSourceUpdated is deprecated. We may explore options with an
                         //  SCMEventListener extension and firing SCMSourceEvents.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/cloud/AbstractSCMHeadEvent.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/cloud/AbstractSCMHeadEvent.java
@@ -40,6 +40,7 @@
 import jenkins.scm.api.SCMHeadEvent;
 import jenkins.scm.api.SCMNavigator;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 public abstract class AbstractSCMHeadEvent<P> extends SCMHeadEvent<P> {
 
@@ -60,7 +61,7 @@ public boolean isMatch(@NonNull SCMNavigator navigator) {
         if (!isServerURLMatch(bbNav.getServerUrl())) {
             return false;
         }
-        return StringUtils.equalsIgnoreCase(bbNav.getRepoOwner(), getRepository().getOwnerName());
+        return Strings.CI.equals(bbNav.getRepoOwner(), getRepository().getOwnerName());
     }
 
     protected abstract BitbucketRepository getRepository();
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/cloud/CloudPushEvent.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/cloud/CloudPushEvent.java
@@ -39,7 +39,7 @@
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.SCMRevision;
 import jenkins.scm.api.SCMSource;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 final class CloudPushEvent extends AbstractSCMHeadEvent<BitbucketPushEvent> {
 
@@ -63,7 +63,7 @@ public Map<SCMHead, SCMRevision> heads(@NonNull SCMSource source) {
         if (!isServerURLMatch(src.getServerUrl())) {
             return Collections.emptyMap();
         }
-        if (!StringUtils.equalsIgnoreCase(src.getRepoOwner(), getPayload().getRepository().getOwnerName())) {
+        if (!Strings.CI.equals(src.getRepoOwner(), getPayload().getRepository().getOwnerName())) {
             return Collections.emptyMap();
         }
         if (!src.getRepository().equalsIgnoreCase(getPayload().getRepository().getRepositoryName())) {
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/cloud/CloudWebhookManager.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/cloud/CloudWebhookManager.java
@@ -54,7 +54,7 @@
 import jenkins.scm.api.trait.SCMSourceTrait;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 
 @Extension
@@ -151,7 +151,7 @@ private void register(@NonNull BitbucketCloudWebhook payload, @NonNull Bitbucket
 
     private boolean shouldUpdate(@NonNull BitbucketCloudWebhook current, @NonNull BitbucketCloudWebhook expected) {
         boolean update = false;
-        if (!StringUtils.equals(current.getUrl(), expected.getUrl())) {
+        if (!Strings.CI.equals(current.getUrl(), expected.getUrl())) {
             current.setUrl(expected.getUrl());
             logger.info(() -> "Update webhook " + current.getUuid() + " callback URL");
             update = true;
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/plugin/PluginWebhookConfiguration.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/plugin/PluginWebhookConfiguration.java
@@ -40,7 +40,6 @@
 import hudson.util.ListBoxModel;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
@@ -57,8 +56,6 @@
 // https://help.moveworkforward.com/BPW/atlassian-bitbucket-post-webhook-api
 // https://help.moveworkforward.com/BPW/how-to-get-configurations-using-post-webhooks-for-
 public class PluginWebhookConfiguration implements BitbucketWebhookConfiguration {
-    private static final Logger logger = Logger.getLogger(PluginWebhookConfiguration.class.getName());
-
     /**
      * {@code true} if and only if Jenkins is supposed to auto-manage hooks for
      * this end-point.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/server/ServerPushEvent.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/server/ServerPushEvent.java
@@ -65,7 +65,7 @@
 import jenkins.scm.api.SCMHeadOrigin;
 import jenkins.scm.api.SCMRevision;
 import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 
 import static java.util.Objects.requireNonNull;
 
@@ -237,7 +237,7 @@ private void addPullRequests(BitbucketSCMSource src, Map<SCMHead, SCMRevision> r
             for (final BitbucketServerPullRequest pullRequest : getPullRequests(src, change).values()) {
                 final BitbucketServerRepository targetRepo = pullRequest.getDestination().getRepository();
                 // check if the target of the PR is actually this source
-                if (!StringUtils.equalsIgnoreCase(sourceOwnerName, targetRepo.getOwnerName())
+                if (!Strings.CI.equals(sourceOwnerName, targetRepo.getOwnerName())
                     || !sourceRepoName.equalsIgnoreCase(targetRepo.getRepositoryName())) {
                     continue;
                 }
@@ -335,7 +335,7 @@ public Collection<BitbucketPullRequest> getPullRequests(BitbucketSCMSource src)
 
     @Override
     protected boolean eventMatchesRepo(BitbucketSCMSource source) {
-        return StringUtils.equalsIgnoreCase(source.getMirrorId(), this.mirrorId) && super.eventMatchesRepo(source);
+        return Strings.CI.equals(source.getMirrorId(), this.mirrorId) && super.eventMatchesRepo(source);
     }
 
 }
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/server/ServerWebhookManager.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/webhook/server/ServerWebhookManager.java
@@ -53,7 +53,6 @@
 import jenkins.scm.api.trait.SCMSourceTrait;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 
 @Extension
@@ -151,7 +150,7 @@ private void register(@NonNull BitbucketServerWebhook payload, @NonNull Bitbucke
 
     private boolean shouldUpdate(@NonNull BitbucketServerWebhook current, @NonNull BitbucketServerWebhook expected) {
         boolean update = false;
-        if (!StringUtils.equals(current.getUrl(), expected.getUrl())) {
+        if (!Objects.equal(current.getUrl(), expected.getUrl())) {
             current.setUrl(expected.getUrl());
             logger.info(() -> "Update webhook " + current.getUuid() + " callback URL");
             update = true;
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java
@@ -797,6 +797,7 @@ protected String getBaseURL() {
         return this.baseURL;
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     public Iterable<SCMFile> getDirectoryContent(BitbucketSCMFile directory) throws IOException {
         List<SCMFile> files = new ArrayList<>();
@@ -828,6 +829,7 @@ public Iterable<SCMFile> getDirectoryContent(BitbucketSCMFile directory) throws
         return files;
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private void collectFileAndDirectories(BitbucketSCMFile parent, List<Map> values, List<SCMFile> files) {
         for(Map file:values) {
             String type = (String) file.get("type");
@@ -876,6 +878,7 @@ public InputStream getFileContent(BitbucketSCMFile file) throws IOException {
 
     private Map<String,Object> collectLines(String response, final List<String> lines) throws IOException {
         Map<String,Object> content = JsonParser.toJava(response, new TypeReference<Map<String,Object>>(){});
+        @SuppressWarnings("unchecked")
         List<Map<String, String>> lineMap = (List<Map<String, String>>) content.get("lines");
         for(Map<String,String> line: lineMap){
             String text = line.get("text");
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/trait/BranchDiscoveryTrait.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/trait/BranchDiscoveryTrait.java
@@ -44,7 +44,7 @@
 import jenkins.scm.api.trait.SCMSourceRequest;
 import jenkins.scm.api.trait.SCMSourceTrait;
 import jenkins.scm.impl.trait.Discovery;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -231,7 +231,7 @@ public boolean isExcluded(@NonNull SCMSourceRequest request, @NonNull SCMHead he
                 try {
                     for (BitbucketPullRequest pullRequest : req.getPullRequests()) {
                         BitbucketRepository source = pullRequest.getSource().getRepository();
-                        if (StringUtils.equalsIgnoreCase(fullName, source.getFullName())
+                        if (Strings.CI.equals(fullName, source.getFullName())
                                 && pullRequest.getSource().getBranch().getName().equals(head.getName())) {
                             request.listener().getLogger().println("Discard branch " + head.getName()
                                     + " because current strategy excludes branches that are also filed as a pull request");
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/trait/ForkPullRequestDiscoveryTrait.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/trait/ForkPullRequestDiscoveryTrait.java
@@ -46,7 +46,7 @@
 import jenkins.scm.api.trait.SCMSourceTrait;
 import jenkins.scm.impl.ChangeRequestSCMHeadCategory;
 import jenkins.scm.impl.trait.Discovery;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -287,7 +287,7 @@ public TrustTeamForks() {
         protected boolean checkTrusted(@NonNull BitbucketSCMSourceRequest request, @NonNull PullRequestSCMHead head)
                 throws IOException, InterruptedException {
             if (!head.getOrigin().equals(SCMHeadOrigin.DEFAULT)) {
-                return StringUtils.equalsIgnoreCase(head.getRepoOwner(), request.getRepoOwner());
+                return Strings.CI.equals(head.getRepoOwner(), request.getRepoOwner());
             }
             return false;
         }
diff --git a/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfigurationTest.java b/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfigurationTest.java
diff --git a/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/trait/WebhookRegistrationTraitTest.java b/src/test/java/com/cloudbees/jenkins/plugins/bitbucket/trait/WebhookRegistrationTraitTest.java

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`import jenkins.scm.api.SCMHeadEvent;`
`41`	`41`	`import jenkins.scm.api.SCMNavigator;`
`42`	`42`	`import org.apache.commons.lang3.StringUtils;`
	`43`	`+import org.apache.commons.lang3.Strings;`
`43`	`44`
`44`	`45`	`public abstract class AbstractSCMHeadEvent<P> extends SCMHeadEvent<P> {`
`45`	`46`
`@@ -60,7 +61,7 @@ public boolean isMatch(@NonNull SCMNavigator navigator) {`
`60`	`61`	`if (!isServerURLMatch(bbNav.getServerUrl())) {`
`61`	`62`	`return false;`
`62`	`63`	`}`
`63`		`- return StringUtils.equalsIgnoreCase(bbNav.getRepoOwner(), getRepository().getOwnerName());`
	`64`	`+ return Strings.CI.equals(bbNav.getRepoOwner(), getRepository().getOwnerName());`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`protected abstract BitbucketRepository getRepository();`