diff --git a/core/src/main/java/hudson/security/PermissionAdder.java b/core/src/main/java/hudson/security/PermissionAdder.java index b2948356eba4..9c6186e667ec 100644 --- a/core/src/main/java/hudson/security/PermissionAdder.java +++ b/core/src/main/java/hudson/security/PermissionAdder.java @@ -24,14 +24,9 @@ package hudson.security; -import hudson.Extension; import hudson.ExtensionPoint; import hudson.model.User; -import java.util.logging.Level; -import java.util.logging.Logger; import jenkins.model.Jenkins; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; /** * Service which can add permissions for a given user to the configured authorization strategy. @@ -40,8 +35,6 @@ */ public abstract class PermissionAdder implements ExtensionPoint { - private static final Logger LOGGER = Logger.getLogger(PermissionAdder.class.getName()); - /** * Called to try to give a user global permission. * @param strategy the configured authorization strategy @@ -51,22 +44,4 @@ public abstract class PermissionAdder implements ExtensionPoint { */ public abstract boolean add(AuthorizationStrategy strategy, User user, Permission perm); - // TODO delete when 1.535 released and matrix-auth can depend on it - @Restricted(NoExternalUse.class) - @Extension public static final class Legacy extends PermissionAdder { - - @Override public boolean add(AuthorizationStrategy strategy, User user, Permission perm) { - try { - strategy.getClass().getMethod("add", Permission.class, String.class).invoke(strategy, Jenkins.ADMINISTER, user.getId()); - return true; - } catch (NoSuchMethodException x) { - // fine, not GlobalMatrixAuthorizationStrategy or a subclass - } catch (Exception x) { - LOGGER.log(Level.WARNING, null, x); - } - return false; - } - - } - } diff --git a/war/pom.xml b/war/pom.xml index 7caf99cf019e..29099ae12259 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -341,7 +341,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-auth - 1.0.2 + 1.1 hpi