From de7d9da3f1f23bfd538e0713305a7ac71341efea Mon Sep 17 00:00:00 2001
From: Valentin Delaye <jonesbusy@users.noreply.github.com>
Date: Fri, 16 Jan 2026 17:01:37 +0100
Subject: [PATCH] Migrate Commons Lang from 2 to 3

---
 pom.xml                                                    | 7 ++++++-
 .../org/jenkinsci/plugins/GitLabAuthenticationToken.java   | 2 +-
 .../org/jenkinsci/plugins/GitLabAuthorizationStrategy.java | 4 ++--
 .../java/org/jenkinsci/plugins/GitLabSecurityRealm.java    | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 66f9abf..8a98b41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>5.28</version>
+        <version>6.2116.v7501b_67dc517</version>
         <relativePath />
     </parent>
     <artifactId>gitlab-oauth</artifactId>
@@ -18,6 +18,7 @@
         <spotbugs.effort>Max</spotbugs.effort>
         <spotbugs.threshold>Low</spotbugs.threshold>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
+        <ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
     </properties>
     <name>GitLab Authentication plugin</name>
     <description>A Jenkins authentication plugin that delegates to GitLab.  We also implement an Authorization Strategy that users the acquired OAuth token to interact with the GitLab API to determine a users level of access to Jenkins.</description>
@@ -82,6 +83,10 @@
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>caffeine-api</artifactId>
         </dependency>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>apache-httpcomponents-client-4-api</artifactId>
diff --git a/src/main/java/org/jenkinsci/plugins/GitLabAuthenticationToken.java b/src/main/java/org/jenkinsci/plugins/GitLabAuthenticationToken.java
index cf474a4..292cb96 100755
--- a/src/main/java/org/jenkinsci/plugins/GitLabAuthenticationToken.java
+++ b/src/main/java/org/jenkinsci/plugins/GitLabAuthenticationToken.java
@@ -42,7 +42,7 @@ of this software and associated documentation files (the "Software"), to deal
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.gitlab4j.api.GitLabApi;
 import org.gitlab4j.api.GitLabApiException;
 import org.gitlab4j.api.models.Group;
diff --git a/src/main/java/org/jenkinsci/plugins/GitLabAuthorizationStrategy.java b/src/main/java/org/jenkinsci/plugins/GitLabAuthorizationStrategy.java
index 78c5c16..65b7f08 100644
--- a/src/main/java/org/jenkinsci/plugins/GitLabAuthorizationStrategy.java
+++ b/src/main/java/org/jenkinsci/plugins/GitLabAuthorizationStrategy.java
@@ -35,8 +35,8 @@ of this software and associated documentation files (the "Software"), to deal
 import hudson.security.AuthorizationStrategy;
 import java.util.ArrayList;
 import java.util.Collection;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
diff --git a/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java b/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java
index 5dcc2af..11a15bb 100644
--- a/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java
+++ b/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java
@@ -58,8 +58,8 @@
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import jenkins.security.SecurityListener;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.NameValuePair;