From 79fb0113c80d742b7f9f10f3c28a6ac63dbbd549 Mon Sep 17 00:00:00 2001 From: Daniel Garnier-Moiroux Date: Tue, 13 Aug 2024 15:22:36 +0200 Subject: [PATCH] Bump io-spring-javaformat from 0.0.42 to 0.0.43 Bumps `io-spring-javaformat` from 0.0.42 to 0.0.43. Updates `io.spring.javaformat:spring-javaformat-checkstyle` from 0.0.42 to 0.0.43 - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](spring-io/spring-javaformat@v0.0.42...v0.0.43) Updates `io.spring.javaformat:spring-javaformat-gradle-plugin` from 0.0.42 to 0.0.43 - [Release notes](https://github.com/spring-io/spring-javaformat/releases) - [Commits](spring-io/spring-javaformat@v0.0.42...v0.0.43) --- updated-dependencies: - dependency-name: io.spring.javaformat:spring-javaformat-checkstyle dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.spring.javaformat:spring-javaformat-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... --- Manual updates: - Adhere to rule where `@Deprecated` annotations and `@deprecated` javadoc comments MUST be used together Signed-off-by: dependabot[bot] --- .../annotation/web/configurers/saml2/Saml2LoginConfigurer.java | 1 + .../security/access/method/MethodSecurityMetadataSource.java | 1 + .../access/prepost/PrePostInvocationAttributeFactory.java | 1 + gradle/libs.versions.toml | 2 +- .../main/java/org/springframework/security/ldap/LdapUtils.java | 1 + .../security/ldap/userdetails/LdapUserDetailsManager.java | 1 + .../JwtIssuerAuthenticationManagerResolverDeprecatedTests.java | 2 ++ ...uerReactiveAuthenticationManagerResolverDeprecatedTests.java | 2 ++ 8 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java index 468afafad4e..8c3bf14b5be 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java @@ -197,6 +197,7 @@ public Saml2LoginConfigurer authenticationRequestResolver( * @return the {@link Saml2LoginConfigurer} for further configuration * @since 6.0 */ + @Deprecated public Saml2LoginConfigurer authenticationRequestUri(String authenticationRequestUri) { Assert.state(authenticationRequestUri.contains("{registrationId}"), "authenticationRequestUri must contain {registrationId} path variable"); diff --git a/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java index 2243236fa9c..1512415f0e9 100644 --- a/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java @@ -34,6 +34,7 @@ * {@code } and {@code } instead or use * annotation-based or {@link AuthorizationManager}-based authorization */ +@Deprecated public interface MethodSecurityMetadataSource extends SecurityMetadataSource { Collection getAttributes(Method method, Class targetClass); diff --git a/core/src/main/java/org/springframework/security/access/prepost/PrePostInvocationAttributeFactory.java b/core/src/main/java/org/springframework/security/access/prepost/PrePostInvocationAttributeFactory.java index 90ef0602078..6c428f10506 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PrePostInvocationAttributeFactory.java +++ b/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, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index daf3b872287..4899b95f315 100644 --- a/gradle/libs.versions.toml +++ b/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" diff --git a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java b/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java index 5909eb8f7aa..d2903e882d6 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java +++ b/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()); diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java index a1487b66653..f4647812aed 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java +++ b/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); diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolverDeprecatedTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolverDeprecatedTests.java index 9301ed104b4..8b58d68dd67 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerAuthenticationManagerResolverDeprecatedTests.java +++ b/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 { diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolverDeprecatedTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolverDeprecatedTests.java index 9e0c08f1a68..ee818814201 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/authentication/JwtIssuerReactiveAuthenticationManagerResolverDeprecatedTests.java +++ b/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 {