Merge branch '6.2.x' into 6.3.x

Author: marcusdacoregio

config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java

@@ -197,6 +197,7 @@ public Saml2LoginConfigurer<B> authenticationRequestResolver(
 	 * @return the {@link Saml2LoginConfigurer} for further configuration
 	 * @since 6.0
 	 */
+	@Deprecated
 	public Saml2LoginConfigurer<B> authenticationRequestUri(String authenticationRequestUri) {
 		Assert.state(authenticationRequestUri.contains("{registrationId}"),
 				"authenticationRequestUri must contain {registrationId} path variable");

core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java

@@ -34,6 +34,7 @@
  * {@code <method-security>} and {@code <intercept-methods>} instead or use
  * annotation-based or {@link AuthorizationManager}-based authorization
  */
+@Deprecated
 public interface MethodSecurityMetadataSource extends SecurityMetadataSource {
 
 	Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass);

core/src/main/java/org/springframework/security/access/prepost/PrePostInvocationAttributeFactory.java

@@ -26,6 +26,7 @@
  * @see org.springframework.security.authorization.method.AuthorizationManagerAfterMethodInterceptor
  * @deprecated Use delegation with {@link AuthorizationManager}
  */
+@Deprecated
 public interface PrePostInvocationAttributeFactory extends AopInfrastructureBean {
 
 	PreInvocationAttribute createPreInvocationAttribute(String preFilterAttribute, String filterObject,

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 com-squareup-okhttp3 = "3.14.9"
 io-rsocket = "1.1.4"
-io-spring-javaformat = "0.0.42"
+io-spring-javaformat = "0.0.43"
 io-spring-nohttp = "0.0.11"
 jakarta-websocket = "2.1.1"
 org-apache-directory-server = "1.5.5"

ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java

@@ -97,6 +97,7 @@ public static String getRelativeName(String fullDn, Context baseCtx) throws Nami
 	/**
 	 * Gets the full dn of a name by prepending the name of the context it is relative to.
 	 * If the name already contains the base name, it is returned unaltered.
+	 * @deprecated Use {@link #getFullDn(LdapName, Context)}
 	 */
 	public static DistinguishedName getFullDn(DistinguishedName dn, Context baseCtx) throws NamingException {
 		DistinguishedName baseDn = new DistinguishedName(baseCtx.getNameInNamespace());

ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java

@@ -284,6 +284,7 @@ public boolean userExists(String username) {
 	 * Creates a DN from a group name.
 	 * @param group the name of the group
 	 * @return the DN of the corresponding group, including the groupSearchBase
+	 * @deprecated
 	 */
 	protected DistinguishedName buildGroupDn(String group) {
 		DistinguishedName dn = new DistinguishedName(this.groupSearchBase);

oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolverDeprecatedTests.java

@@ -49,6 +49,8 @@
 
 /**
  * Tests for {@link JwtIssuerAuthenticationManagerResolver}
+ *
+ * @deprecated Superseded by {@link JwtIssuerAuthenticationManagerResolverTests}
  */
 @Deprecated
 public class JwtIssuerAuthenticationManagerResolverDeprecatedTests {

oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolverDeprecatedTests.java

@@ -52,6 +52,8 @@
 
 /**
  * Tests for {@link JwtIssuerReactiveAuthenticationManagerResolver}
+ *
+ * @deprecated Superseded by {@link JwtIssuerReactiveAuthenticationManagerResolverTests}
  */
 @Deprecated
 public class JwtIssuerReactiveAuthenticationManagerResolverDeprecatedTests {