Deprecate SERIAL_VERSION_UID

Closes gh-17623
This commit is contained in:
Josh Cummings 2025-08-07 11:09:35 -06:00
parent 6f1232ce79
commit 6d1a886f92
51 changed files with 57 additions and 54 deletions

View File

@ -31,7 +31,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
*/ */
public final class CasAssertionAuthenticationToken extends AbstractAuthenticationToken { public final class CasAssertionAuthenticationToken extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final Assertion assertion; private final Assertion assertion;

View File

@ -36,7 +36,7 @@ import org.springframework.util.ObjectUtils;
*/ */
public class CasAuthenticationToken extends AbstractAuthenticationToken implements Serializable { public class CasAuthenticationToken extends AbstractAuthenticationToken implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final Object credentials; private final Object credentials;

View File

@ -38,7 +38,7 @@ public class CasServiceTicketAuthenticationToken extends AbstractAuthenticationT
static final String CAS_STATEFUL_IDENTIFIER = "_cas_stateful_"; static final String CAS_STATEFUL_IDENTIFIER = "_cas_stateful_";
@Serial @Serial
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String identifier; private final String identifier;

View File

@ -70,7 +70,7 @@ import static org.assertj.core.api.Assertions.fail;
*/ */
class SpringSecurityCoreVersionSerializableTests { class SpringSecurityCoreVersionSerializableTests {
static final long securitySerialVersionUid = SpringSecurityCoreVersion.SERIAL_VERSION_UID; static final long securitySerialVersionUid = 620L;
static Path currentVersionFolder = Paths.get("src/test/resources/serialized/" + getCurrentVersion()); static Path currentVersionFolder = Paths.get("src/test/resources/serialized/" + getCurrentVersion());

View File

@ -35,7 +35,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
@Deprecated @Deprecated
public class RunAsUserToken extends AbstractAuthenticationToken { public class RunAsUserToken extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final Class<? extends Authentication> originalAuthentication; private final Class<? extends Authentication> originalAuthentication;

View File

@ -32,7 +32,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
*/ */
public class RememberMeAuthenticationToken extends AbstractAuthenticationToken { public class RememberMeAuthenticationToken extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final Object principal; private final Object principal;

View File

@ -38,7 +38,7 @@ import org.springframework.util.Assert;
*/ */
public class UsernamePasswordAuthenticationToken extends AbstractAuthenticationToken { public class UsernamePasswordAuthenticationToken extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final Object principal; private final Object principal;

View File

@ -34,7 +34,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
*/ */
public class JaasAuthenticationToken extends UsernamePasswordAuthenticationToken { public class JaasAuthenticationToken extends UsernamePasswordAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final transient LoginContext loginContext; private final transient LoginContext loginContext;

View File

@ -31,7 +31,7 @@ import org.springframework.util.Assert;
*/ */
public final class JaasGrantedAuthority implements GrantedAuthority { public final class JaasGrantedAuthority implements GrantedAuthority {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String role; private final String role;

View File

@ -41,7 +41,10 @@ public final class SpringSecurityCoreVersion {
/** /**
* Global Serialization value for Spring Security classes. * Global Serialization value for Spring Security classes.
* @deprecated Please have each class use its own serialization version
* @see SpringSecurityCoreVersionSerializableTests
*/ */
@Deprecated(forRemoval = true)
public static final long SERIAL_VERSION_UID = 620L; public static final long SERIAL_VERSION_UID = 620L;
static final @Nullable String MIN_SPRING_VERSION = getSpringVersion(); static final @Nullable String MIN_SPRING_VERSION = getSpringVersion();

View File

@ -31,7 +31,7 @@ import org.springframework.util.Assert;
*/ */
public final class SimpleGrantedAuthority implements GrantedAuthority { public final class SimpleGrantedAuthority implements GrantedAuthority {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String role; private final String role;

View File

@ -31,7 +31,7 @@ import org.springframework.util.ObjectUtils;
*/ */
public class SecurityContextImpl implements SecurityContext { public class SecurityContextImpl implements SecurityContext {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private @Nullable Authentication authentication; private @Nullable Authentication authentication;

View File

@ -28,7 +28,7 @@ import org.springframework.util.Assert;
public class ReactiveSessionInformation implements Serializable { public class ReactiveSessionInformation implements Serializable {
@Serial @Serial
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private Instant lastAccessTime; private Instant lastAccessTime;

View File

@ -39,7 +39,7 @@ import org.springframework.util.Assert;
*/ */
public class SessionInformation implements Serializable { public class SessionInformation implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private Date lastRequest; private Date lastRequest;

View File

@ -63,7 +63,7 @@ import org.springframework.util.Assert;
*/ */
public class User implements UserDetails, CredentialsContainer { public class User implements UserDetails, CredentialsContainer {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private static final Log logger = LogFactory.getLog(User.class); private static final Log logger = LogFactory.getLog(User.class);
@ -304,7 +304,7 @@ public class User implements UserDetails, CredentialsContainer {
private static class AuthorityComparator implements Comparator<GrantedAuthority>, Serializable { private static class AuthorityComparator implements Comparator<GrantedAuthority>, Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
@Override @Override
public int compare(GrantedAuthority g1, GrantedAuthority g2) { public int compare(GrantedAuthority g1, GrantedAuthority g2) {

View File

@ -30,7 +30,7 @@ import org.springframework.security.core.userdetails.UserDetails;
*/ */
class MutableUser implements MutableUserDetails { class MutableUser implements MutableUserDetails {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private @Nullable String password; private @Nullable String password;

View File

@ -31,7 +31,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
*/ */
public class InetOrgPerson extends Person { public class InetOrgPerson extends Person {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private String carLicense; private String carLicense;

View File

@ -49,7 +49,7 @@ import org.springframework.util.Assert;
*/ */
public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData { public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private String dn; private String dn;

View File

@ -35,7 +35,7 @@ import org.springframework.util.Assert;
*/ */
public class Person extends LdapUserDetailsImpl { public class Person extends LdapUserDetailsImpl {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private String givenName; private String givenName;

View File

@ -43,7 +43,7 @@ import org.springframework.util.Assert;
*/ */
public class OAuth2AuthorizedClient implements Serializable { public class OAuth2AuthorizedClient implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final ClientRegistration clientRegistration; private final ClientRegistration clientRegistration;

View File

@ -33,7 +33,7 @@ import org.springframework.util.Assert;
*/ */
public final class OAuth2AuthorizedClientId implements Serializable { public final class OAuth2AuthorizedClientId implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String clientRegistrationId; private final String clientRegistrationId;

View File

@ -43,7 +43,7 @@ import org.springframework.util.Assert;
*/ */
public class OAuth2AuthenticationToken extends AbstractAuthenticationToken { public class OAuth2AuthenticationToken extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final OAuth2User principal; private final OAuth2User principal;

View File

@ -43,7 +43,7 @@ import org.springframework.util.Assert;
*/ */
public class OAuth2AuthorizationCodeAuthenticationToken extends AbstractAuthenticationToken { public class OAuth2AuthorizationCodeAuthenticationToken extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private Map<String, Object> additionalParameters = new HashMap<>(); private Map<String, Object> additionalParameters = new HashMap<>();

View File

@ -46,7 +46,7 @@ import org.springframework.util.Assert;
*/ */
public class OAuth2LoginAuthenticationToken extends AbstractAuthenticationToken { public class OAuth2LoginAuthenticationToken extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private OAuth2User principal; private OAuth2User principal;

View File

@ -53,7 +53,7 @@ import org.springframework.util.StringUtils;
*/ */
public final class ClientRegistration implements Serializable { public final class ClientRegistration implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private String registrationId; private String registrationId;
@ -219,7 +219,7 @@ public final class ClientRegistration implements Serializable {
*/ */
public class ProviderDetails implements Serializable { public class ProviderDetails implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private String authorizationUri; private String authorizationUri;
@ -293,7 +293,7 @@ public final class ClientRegistration implements Serializable {
*/ */
public class UserInfoEndpoint implements Serializable { public class UserInfoEndpoint implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private String uri; private String uri;
@ -340,7 +340,7 @@ public final class ClientRegistration implements Serializable {
*/ */
public static final class Builder implements Serializable { public static final class Builder implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private static final Log logger = LogFactory.getLog(Builder.class); private static final Log logger = LogFactory.getLog(Builder.class);

View File

@ -34,7 +34,7 @@ import org.springframework.util.Assert;
*/ */
public abstract class AbstractOAuth2Token implements OAuth2Token, Serializable { public abstract class AbstractOAuth2Token implements OAuth2Token, Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String tokenValue; private final String tokenValue;

View File

@ -32,7 +32,7 @@ import org.springframework.util.Assert;
*/ */
public final class AuthenticationMethod implements Serializable { public final class AuthenticationMethod implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
public static final AuthenticationMethod HEADER = new AuthenticationMethod("header"); public static final AuthenticationMethod HEADER = new AuthenticationMethod("header");

View File

@ -39,7 +39,7 @@ import org.springframework.util.Assert;
*/ */
public final class AuthorizationGrantType implements Serializable { public final class AuthorizationGrantType implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
public static final AuthorizationGrantType AUTHORIZATION_CODE = new AuthorizationGrantType("authorization_code"); public static final AuthorizationGrantType AUTHORIZATION_CODE = new AuthorizationGrantType("authorization_code");

View File

@ -33,7 +33,7 @@ import org.springframework.util.Assert;
*/ */
public final class ClientAuthenticationMethod implements Serializable { public final class ClientAuthenticationMethod implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
/** /**
* @since 5.5 * @since 5.5

View File

@ -103,7 +103,7 @@ public class OAuth2AccessToken extends AbstractOAuth2Token {
*/ */
public static final class TokenType implements Serializable { public static final class TokenType implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
public static final TokenType BEARER = new TokenType("Bearer"); public static final TokenType BEARER = new TokenType("Bearer");

View File

@ -38,7 +38,7 @@ import org.springframework.util.Assert;
*/ */
public class OAuth2Error implements Serializable { public class OAuth2Error implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String errorCode; private final String errorCode;

View File

@ -34,7 +34,7 @@ import org.springframework.util.Assert;
public final class OAuth2AuthorizationExchange implements Serializable { public final class OAuth2AuthorizationExchange implements Serializable {
@Serial @Serial
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final OAuth2AuthorizationRequest authorizationRequest; private final OAuth2AuthorizationRequest authorizationRequest;

View File

@ -54,7 +54,7 @@ import org.springframework.web.util.UriUtils;
*/ */
public final class OAuth2AuthorizationRequest implements Serializable { public final class OAuth2AuthorizationRequest implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private String authorizationUri; private String authorizationUri;

View File

@ -38,7 +38,7 @@ import org.springframework.util.StringUtils;
public final class OAuth2AuthorizationResponse implements Serializable { public final class OAuth2AuthorizationResponse implements Serializable {
@Serial @Serial
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private String redirectUri; private String redirectUri;

View File

@ -37,7 +37,7 @@ import org.springframework.util.Assert;
*/ */
public final class OAuth2AuthorizationResponseType implements Serializable { public final class OAuth2AuthorizationResponseType implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
public static final OAuth2AuthorizationResponseType CODE = new OAuth2AuthorizationResponseType("code"); public static final OAuth2AuthorizationResponseType CODE = new OAuth2AuthorizationResponseType("code");

View File

@ -48,7 +48,7 @@ import org.springframework.util.Assert;
*/ */
public class OidcUserInfo implements StandardClaimAccessor, Serializable { public class OidcUserInfo implements StandardClaimAccessor, Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final Map<String, Object> claims; private final Map<String, Object> claims;

View File

@ -50,7 +50,7 @@ import org.springframework.util.Assert;
*/ */
public class DefaultOAuth2User implements OAuth2User, Serializable { public class DefaultOAuth2User implements OAuth2User, Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final Set<GrantedAuthority> authorities; private final Set<GrantedAuthority> authorities;

View File

@ -36,7 +36,7 @@ import org.springframework.util.Assert;
*/ */
public class OAuth2UserAuthority implements GrantedAuthority { public class OAuth2UserAuthority implements GrantedAuthority {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String authority; private final String authority;

View File

@ -48,7 +48,7 @@ import org.springframework.util.Assert;
public abstract class AbstractOAuth2TokenAuthenticationToken<T extends OAuth2Token> public abstract class AbstractOAuth2TokenAuthenticationToken<T extends OAuth2Token>
extends AbstractAuthenticationToken { extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private Object principal; private Object principal;

View File

@ -38,7 +38,7 @@ import org.springframework.util.Assert;
@Transient @Transient
public class BearerTokenAuthentication extends AbstractOAuth2TokenAuthenticationToken<OAuth2AccessToken> { public class BearerTokenAuthentication extends AbstractOAuth2TokenAuthenticationToken<OAuth2AccessToken> {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final Map<String, Object> attributes; private final Map<String, Object> attributes;

View File

@ -37,7 +37,7 @@ import org.springframework.util.Assert;
*/ */
public class BearerTokenAuthenticationToken extends AbstractAuthenticationToken { public class BearerTokenAuthenticationToken extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String token; private final String token;

View File

@ -36,7 +36,7 @@ import org.springframework.security.oauth2.jwt.Jwt;
@Transient @Transient
public class JwtAuthenticationToken extends AbstractOAuth2TokenAuthenticationToken<Jwt> { public class JwtAuthenticationToken extends AbstractOAuth2TokenAuthenticationToken<Jwt> {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String name; private final String name;

View File

@ -34,7 +34,7 @@ import org.springframework.util.Assert;
*/ */
public class Saml2Error implements Serializable { public class Saml2Error implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String errorCode; private final String errorCode;

View File

@ -39,7 +39,7 @@ import org.springframework.util.Assert;
*/ */
public abstract class AbstractSaml2AuthenticationRequest implements Serializable { public abstract class AbstractSaml2AuthenticationRequest implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String samlRequest; private final String samlRequest;

View File

@ -26,7 +26,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
*/ */
public class UnreachableFilterChainException extends IllegalArgumentException { public class UnreachableFilterChainException extends IllegalArgumentException {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final SecurityFilterChain filterChain; private final SecurityFilterChain filterChain;

View File

@ -32,7 +32,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
*/ */
public class WebAuthenticationDetails implements Serializable { public class WebAuthenticationDetails implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String remoteAddress; private final String remoteAddress;

View File

@ -31,7 +31,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
*/ */
public class PreAuthenticatedAuthenticationToken extends AbstractAuthenticationToken { public class PreAuthenticatedAuthenticationToken extends AbstractAuthenticationToken {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final Object principal; private final Object principal;

View File

@ -39,7 +39,7 @@ import org.springframework.security.web.authentication.WebAuthenticationDetails;
public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails extends WebAuthenticationDetails public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails extends WebAuthenticationDetails
implements GrantedAuthoritiesContainer { implements GrantedAuthoritiesContainer {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final List<GrantedAuthority> authorities; private final List<GrantedAuthority> authorities;

View File

@ -33,7 +33,7 @@ import org.springframework.util.Assert;
*/ */
public final class SwitchUserGrantedAuthority implements GrantedAuthority { public final class SwitchUserGrantedAuthority implements GrantedAuthority {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String role; private final String role;

View File

@ -62,7 +62,7 @@ import org.springframework.web.util.UriComponentsBuilder;
*/ */
public class DefaultSavedRequest implements SavedRequest { public class DefaultSavedRequest implements SavedRequest {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
protected static final Log logger = LogFactory.getLog(DefaultSavedRequest.class); protected static final Log logger = LogFactory.getLog(DefaultSavedRequest.class);

View File

@ -29,7 +29,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
*/ */
public class SavedCookie implements Serializable { public class SavedCookie implements Serializable {
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = 620L;
private final String name; private final String name;