bumped to v3.84.1-01

Author: flopma

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.sonatype.nexus.plugins</groupId>
         <artifactId>nexus-plugins</artifactId>
-        <version>3.81.1-01</version>
+        <version>3.84.1-01</version>
     </parent>
 
     <groupId>com.roumanoff.nexus</groupId>

src/main/java/org/sonatype/nexus/plugins/crowd/client/rest/CachingRestClient.java

@@ -15,10 +15,6 @@
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import org.apache.commons.codec.digest.DigestUtils;
 import org.ehcache.Cache;
 import org.ehcache.CacheManager;
@@ -31,6 +27,9 @@
 import org.sonatype.nexus.plugins.crowd.config.CrowdPluginConfiguration;
 import org.sonatype.nexus.security.role.Role;
 import org.sonatype.nexus.security.user.User;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 /**
  * @author Issa Gorissen

src/main/java/org/sonatype/nexus/plugins/crowd/config/CrowdTestResource.java

@@ -12,9 +12,6 @@
  */
 package org.sonatype.nexus.plugins.crowd.config;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -23,6 +20,9 @@
 import org.sonatype.nexus.plugins.crowd.client.rest.RestClient;
 import org.sonatype.nexus.plugins.crowd.client.rest.RestException;
 import org.sonatype.nexus.rest.Resource;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 
 /**

src/main/java/org/sonatype/nexus/plugins/crowd/config/DefaultCrowdPluginConfiguration.java

@@ -19,12 +19,11 @@
 import java.io.InputStream;
 import java.util.Properties;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Named
 @Singleton

src/main/java/org/sonatype/nexus/plugins/crowd/security/CrowdAuthenticatingRealm.java

@@ -15,11 +15,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.enterprise.inject.Typed;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.IncorrectCredentialsException;
@@ -30,17 +25,20 @@
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.apache.shiro.realm.AuthorizingRealm;
-import org.apache.shiro.realm.Realm;
 import org.apache.shiro.subject.PrincipalCollection;
 import org.eclipse.sisu.Description;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonatype.nexus.plugins.crowd.client.rest.RestClient;
 import org.sonatype.nexus.plugins.crowd.client.rest.RestException;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
-@Named(CrowdAuthenticatingRealm.NAME)
-@Typed({Realm.class})
+@Component
+@Qualifier(CrowdAuthenticatingRealm.NAME)
 @Description("OSS Crowd Authentication Realm")
 public class CrowdAuthenticatingRealm extends AuthorizingRealm {
     private static final Logger LOG = LoggerFactory.getLogger(CrowdAuthenticatingRealm.class);

src/main/java/org/sonatype/nexus/plugins/crowd/security/CrowdAuthorizationManager.java

@@ -17,10 +17,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonatype.nexus.plugins.crowd.client.rest.RestClient;
@@ -30,18 +26,21 @@
 import org.sonatype.nexus.security.privilege.Privilege;
 import org.sonatype.nexus.security.role.NoSuchRoleException;
 import org.sonatype.nexus.security.role.Role;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 /**
  * @author justin
  * @author Issa Gorissen
  */
 @Singleton
-@Named("OSSCrowd")
+@Component
+@Qualifier("OSSCrowdAuthorizationManager")
 public class CrowdAuthorizationManager extends AbstractReadOnlyAuthorizationManager {
     private static final Logger LOG = LoggerFactory.getLogger(CrowdAuthorizationManager.class);
 
-    private static final String SOURCE = "OSSCrowd";
-
     private RestClient restClient;
 
     @Inject
@@ -53,7 +52,12 @@ public CrowdAuthorizationManager(RestClient rc) {
 
     @Override
     public String getSource() {
-        return SOURCE;
+        return CrowdUserManager.SOURCE;
+    }
+    
+    @Override
+    public String getRealmName() {
+      return CrowdAuthenticatingRealm.NAME;
     }
 
     @Override

src/main/java/org/sonatype/nexus/plugins/crowd/security/CrowdUserManager.java

@@ -16,30 +16,32 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import org.sonatype.nexus.plugins.crowd.client.rest.RestClient;
 import org.sonatype.nexus.plugins.crowd.client.rest.RestException;
 import org.sonatype.nexus.security.role.RoleIdentifier;
 import org.sonatype.nexus.security.user.AbstractReadOnlyUserManager;
 import org.sonatype.nexus.security.user.User;
 import org.sonatype.nexus.security.user.UserNotFoundException;
 import org.sonatype.nexus.security.user.UserSearchCriteria;
-
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Description;
+import org.springframework.stereotype.Component;
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 /**
  * @author justin
  * @author Issa Gorissen
  */
-@Named("OSSCrowd")
+@Qualifier(CrowdUserManager.SOURCE)
 @Singleton
+@Component
+@Description("Crowd")
 public class CrowdUserManager extends AbstractReadOnlyUserManager {
-    private static final String SOURCE = "OSSCrowd";
+    public static final String SOURCE = "OSSCrowd";
 
     private RestClient restClient;