From 13b4290841d72ccdc8f664f13bf4f32a6b6f6d75 Mon Sep 17 00:00:00 2001 From: Guruprasad Bhat Date: Wed, 22 Jul 2026 16:41:48 +0530 Subject: [PATCH 1/2] Migrate commons-lang2 to lang3 --- .../plugins/oic/properties/DisableTokenVerification.java | 2 +- .../java/org/jenkinsci/plugins/oic/properties/EscapeHatch.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/oic/properties/DisableTokenVerification.java b/src/main/java/org/jenkinsci/plugins/oic/properties/DisableTokenVerification.java index b99906a3..93cd61f1 100644 --- a/src/main/java/org/jenkinsci/plugins/oic/properties/DisableTokenVerification.java +++ b/src/main/java/org/jenkinsci/plugins/oic/properties/DisableTokenVerification.java @@ -4,7 +4,7 @@ import hudson.Extension; import java.io.Serial; import jenkins.security.FIPS140; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import org.jenkinsci.plugins.oic.AnythingGoesTokenValidator; import org.jenkinsci.plugins.oic.OicServerConfiguration; import org.jenkinsci.plugins.oic.OidcProperty; diff --git a/src/main/java/org/jenkinsci/plugins/oic/properties/EscapeHatch.java b/src/main/java/org/jenkinsci/plugins/oic/properties/EscapeHatch.java index eabcf75b..9e874d83 100644 --- a/src/main/java/org/jenkinsci/plugins/oic/properties/EscapeHatch.java +++ b/src/main/java/org/jenkinsci/plugins/oic/properties/EscapeHatch.java @@ -1,6 +1,6 @@ package org.jenkinsci.plugins.oic.properties; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; From fd5c56638f6120a1f14deb22af4177afe09e4b01 Mon Sep 17 00:00:00 2001 From: Guruprasad Bhat Date: Wed, 22 Jul 2026 16:47:09 +0530 Subject: [PATCH 2/2] enable the ban lang2 prop as well --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index b1e3bc17..80961ffa 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,7 @@ --> 6.4.3 content-type,jmespath-core,lang-tag,oauth2-oidc-sdk,pac4j-core,pac4j-jakartaee,pac4j-oidc,protobuf-java,tink + false