Update Spring dependencies

Author: Brutus5000

.idea/compiler.xml

@@ -224,7 +224,6 @@ dependencies {
   implementation("org.kohsuke:github-api:${githubApiVersion}")
   implementation("org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:${springSecurityOauth2AutoConfigureVersion}")
   implementation("org.springframework.security.oauth:spring-security-oauth2:${springSecurityOauth2Version}")
-  implementation("org.springframework.security:spring-security-jwt:${springSecurityJwtVersion}")
   implementation("org.eclipse.jgit:org.eclipse.jgit:${jgitVersionn}")
   implementation("org.jetbrains:annotations:${jetbrainsAnnotationsVersion}")
   implementation("com.google.guava:guava:${guavaVersion}")

build.gradle

@@ -1,17 +1,16 @@
 profile=dev
 springDependencyManagementVersion=1.0.10.RELEASE
-springBootVersion=2.3.5.RELEASE
+springBootVersion=2.3.6.RELEASE
 javaxInjectVersion=1
 elideVersion=4.6.8
-mysqlConnectorVersion=8.0.21
+mysqlConnectorVersion=8.0.22
 springfoxSwaggerVersion=3.0.0
 coverallsGradlePluginVersion=2.10.2
-springSecurityJwtVersion=1.0.11.RELEASE
-springSecurityOauth2AutoConfigureVersion=2.3.1.RELEASE
-springSecurityOauth2Version=2.3.6.RELEASE
+springSecurityOauth2AutoConfigureVersion=2.3.4.RELEASE
+springSecurityOauth2Version=2.5.0.RELEASE
 guavaVersion=29.0-jre
 jetbrainsAnnotationsVersion=13.0
-springBootAdminClientVersion=2.2.2
+springBootAdminClientVersion=2.3.1
 luajVersion=3.0.1
 nocatchVersion=1.1
 junitAddonsVersion=1.4

gradle.properties

@@ -5,15 +5,11 @@
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.provider.token.DefaultUserAuthenticationConverter;
-import org.springframework.util.StringUtils;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.springframework.security.core.authority.AuthorityUtils.commaSeparatedStringToAuthorityList;
-
 /**
  * Converts a {@link FafUserDetails} from and to an {@link Authentication} for use in a JWT token.
  */
@@ -48,18 +44,4 @@ public Authentication extractAuthentication(Map<String, ?> map) {
 
     return new UsernamePasswordAuthenticationToken(user, "N/A", authorities);
   }
-
-  private Collection<? extends GrantedAuthority> getAuthorities(Map<String, ?> map) {
-    if (!map.containsKey(AUTHORITIES)) {
-      return Collections.emptySet();
-    }
-    Object authorities = map.get(AUTHORITIES);
-    if (authorities instanceof String) {
-      return commaSeparatedStringToAuthorityList((String) authorities);
-    }
-    if (authorities instanceof Collection) {
-      return commaSeparatedStringToAuthorityList(StringUtils.collectionToCommaDelimitedString((Collection<?>) authorities));
-    }
-    throw new IllegalArgumentException("Authorities must be either a String or a Collection");
-  }
 }