From 9688cce246ae0de33d853cb72fb214a13ee090b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:50:49 +0000 Subject: [PATCH 1/2] Bump com.puppycrawl.tools:checkstyle from 10.12.4 to 10.13.0 Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.12.4 to 10.13.0. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.12.4...checkstyle-10.13.0) --- updated-dependencies: - dependency-name: com.puppycrawl.tools:checkstyle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce1968f8..e0c41add 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 999999-SNAPSHOT 2.387.3 - 10.12.4 + 10.13.0 640 From b07d973410ec48e20a051cc62beb3e287329025e Mon Sep 17 00:00:00 2001 From: Markus Winter Date: Thu, 29 Feb 2024 17:32:54 +0100 Subject: [PATCH 2/2] use StringUtils from commons lang3 api plugin --- pom.xml | 11 +++++------ .../plugins/rolestrategy/PermissionTemplate.java | 2 -- .../rolestrategy/RoleBasedAuthorizationStrategy.java | 4 +--- .../hudson/plugins/rolestrategy/ValidationUtil.java | 2 +- .../rolestrategy/RoleBasedProjectNamingStrategy.java | 2 +- .../plugins/rolestrategy/casc/GrantedRoles.java | 1 - 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index ce1968f8..65e17ef3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 4.75 + 4.78 @@ -75,6 +75,10 @@ io.jenkins.plugins caffeine-api + + io.jenkins.plugins + commons-lang3-api + io.jenkins configuration-as-code @@ -101,11 +105,6 @@ 0.13.0 test - - io.jenkins.plugins - commons-lang3-api - test - org.jenkins-ci.plugins authorize-project diff --git a/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/PermissionTemplate.java b/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/PermissionTemplate.java index 4100236b..5dd8b078 100644 --- a/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/PermissionTemplate.java +++ b/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/PermissionTemplate.java @@ -12,8 +12,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import jenkins.model.Jenkins; -import jenkins.model.ProjectNamingStrategy; -import org.jenkinsci.plugins.rolestrategy.RoleBasedProjectNamingStrategy; import org.jenkinsci.plugins.rolestrategy.permissions.PermissionHelper; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; diff --git a/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java b/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java index 7268ed11..b15d09b3 100644 --- a/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java +++ b/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/RoleBasedAuthorizationStrategy.java @@ -70,11 +70,9 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; @@ -85,7 +83,7 @@ import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.acegisecurity.acls.sid.PrincipalSid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jenkinsci.plugins.rolestrategy.AmbiguousSidsAdminMonitor; import org.jenkinsci.plugins.rolestrategy.permissions.PermissionHelper; import org.kohsuke.accmod.Restricted; diff --git a/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/ValidationUtil.java b/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/ValidationUtil.java index 992b8ed6..641e7783 100644 --- a/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/ValidationUtil.java +++ b/src/main/java/com/michelin/cio/hudson/plugins/rolestrategy/ValidationUtil.java @@ -6,7 +6,7 @@ import hudson.security.SecurityRealm; import hudson.security.UserMayOrMayNotExistException2; import hudson.util.FormValidation; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jenkins.ui.symbol.Symbol; import org.jenkins.ui.symbol.SymbolRequest; import org.kohsuke.accmod.Restricted; diff --git a/src/main/java/org/jenkinsci/plugins/rolestrategy/RoleBasedProjectNamingStrategy.java b/src/main/java/org/jenkinsci/plugins/rolestrategy/RoleBasedProjectNamingStrategy.java index 3a7adb6b..a2103d51 100644 --- a/src/main/java/org/jenkinsci/plugins/rolestrategy/RoleBasedProjectNamingStrategy.java +++ b/src/main/java/org/jenkinsci/plugins/rolestrategy/RoleBasedProjectNamingStrategy.java @@ -25,7 +25,7 @@ import jenkins.model.Jenkins; import jenkins.model.ProjectNamingStrategy; import org.acegisecurity.acls.sid.PrincipalSid; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.Stapler; import org.kohsuke.stapler.StaplerRequest; diff --git a/src/main/java/org/jenkinsci/plugins/rolestrategy/casc/GrantedRoles.java b/src/main/java/org/jenkinsci/plugins/rolestrategy/casc/GrantedRoles.java index 93b2afe0..cc9a0c3f 100644 --- a/src/main/java/org/jenkinsci/plugins/rolestrategy/casc/GrantedRoles.java +++ b/src/main/java/org/jenkinsci/plugins/rolestrategy/casc/GrantedRoles.java @@ -7,7 +7,6 @@ import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap;