From 6d1a886f92a58ddb388e97f1eba16aaaaf62377d Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Thu, 7 Aug 2025 11:09:35 -0600 Subject: [PATCH] Deprecate SERIAL_VERSION_UID Closes gh-17623 --- .../authentication/CasAssertionAuthenticationToken.java | 2 +- .../cas/authentication/CasAuthenticationToken.java | 2 +- .../CasServiceTicketAuthenticationToken.java | 2 +- .../SpringSecurityCoreVersionSerializableTests.java | 2 +- .../security/access/intercept/RunAsUserToken.java | 2 +- .../authentication/RememberMeAuthenticationToken.java | 2 +- .../UsernamePasswordAuthenticationToken.java | 2 +- .../authentication/jaas/JaasAuthenticationToken.java | 2 +- .../authentication/jaas/JaasGrantedAuthority.java | 2 +- .../security/core/SpringSecurityCoreVersion.java | 3 +++ .../security/core/authority/SimpleGrantedAuthority.java | 2 +- .../security/core/context/SecurityContextImpl.java | 2 +- .../security/core/session/ReactiveSessionInformation.java | 2 +- .../security/core/session/SessionInformation.java | 2 +- .../springframework/security/core/userdetails/User.java | 4 ++-- .../security/provisioning/MutableUser.java | 2 +- .../security/ldap/userdetails/InetOrgPerson.java | 2 +- .../security/ldap/userdetails/LdapUserDetailsImpl.java | 2 +- .../springframework/security/ldap/userdetails/Person.java | 2 +- .../security/oauth2/client/OAuth2AuthorizedClient.java | 2 +- .../security/oauth2/client/OAuth2AuthorizedClientId.java | 2 +- .../client/authentication/OAuth2AuthenticationToken.java | 2 +- .../OAuth2AuthorizationCodeAuthenticationToken.java | 2 +- .../authentication/OAuth2LoginAuthenticationToken.java | 2 +- .../oauth2/client/registration/ClientRegistration.java | 8 ++++---- .../security/oauth2/core/AbstractOAuth2Token.java | 2 +- .../security/oauth2/core/AuthenticationMethod.java | 2 +- .../security/oauth2/core/AuthorizationGrantType.java | 2 +- .../security/oauth2/core/ClientAuthenticationMethod.java | 2 +- .../security/oauth2/core/OAuth2AccessToken.java | 2 +- .../springframework/security/oauth2/core/OAuth2Error.java | 2 +- .../oauth2/core/endpoint/OAuth2AuthorizationExchange.java | 2 +- .../oauth2/core/endpoint/OAuth2AuthorizationRequest.java | 2 +- .../oauth2/core/endpoint/OAuth2AuthorizationResponse.java | 2 +- .../core/endpoint/OAuth2AuthorizationResponseType.java | 2 +- .../security/oauth2/core/oidc/OidcUserInfo.java | 2 +- .../security/oauth2/core/user/DefaultOAuth2User.java | 2 +- .../security/oauth2/core/user/OAuth2UserAuthority.java | 2 +- .../AbstractOAuth2TokenAuthenticationToken.java | 2 +- .../authentication/BearerTokenAuthentication.java | 2 +- .../authentication/BearerTokenAuthenticationToken.java | 2 +- .../resource/authentication/JwtAuthenticationToken.java | 2 +- .../springframework/security/saml2/core/Saml2Error.java | 2 +- .../AbstractSaml2AuthenticationRequest.java | 2 +- .../security/web/UnreachableFilterChainException.java | 2 +- .../web/authentication/WebAuthenticationDetails.java | 2 +- .../preauth/PreAuthenticatedAuthenticationToken.java | 2 +- ...ticatedGrantedAuthoritiesWebAuthenticationDetails.java | 2 +- .../switchuser/SwitchUserGrantedAuthority.java | 2 +- .../security/web/savedrequest/DefaultSavedRequest.java | 2 +- .../security/web/savedrequest/SavedCookie.java | 2 +- 51 files changed, 57 insertions(+), 54 deletions(-) diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java index 9d93152094..2c73d1c76d 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java @@ -31,7 +31,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; */ 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; diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java index 0bb9c4d28b..f834a5fe6f 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java @@ -36,7 +36,7 @@ import org.springframework.util.ObjectUtils; */ 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; diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasServiceTicketAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasServiceTicketAuthenticationToken.java index 476c038062..d6ca0696c3 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasServiceTicketAuthenticationToken.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasServiceTicketAuthenticationToken.java @@ -38,7 +38,7 @@ public class CasServiceTicketAuthenticationToken extends AbstractAuthenticationT static final String CAS_STATEFUL_IDENTIFIER = "_cas_stateful_"; @Serial - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final String identifier; diff --git a/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java b/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java index b05ae49f77..98b1d346ee 100644 --- a/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java +++ b/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java @@ -70,7 +70,7 @@ import static org.assertj.core.api.Assertions.fail; */ 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()); diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java index 2fc19b0ca7..3dd469e7b5 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java @@ -35,7 +35,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; @Deprecated public class RunAsUserToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final Class originalAuthentication; diff --git a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java index 629372bc1a..e59f60a6de 100644 --- a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java @@ -32,7 +32,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; */ public class RememberMeAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final Object principal; diff --git a/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java index 7c8af99bcd..6dd7ab0ef5 100644 --- a/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java @@ -38,7 +38,7 @@ import org.springframework.util.Assert; */ public class UsernamePasswordAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final Object principal; diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java index 57f43c2aac..254ac8c8c9 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java @@ -34,7 +34,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; */ 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; diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java index 8096947840..81a89d7411 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java @@ -31,7 +31,7 @@ import org.springframework.util.Assert; */ 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; diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java index b2d11d497f..726db080f3 100644 --- a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java +++ b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java @@ -41,7 +41,10 @@ public final class SpringSecurityCoreVersion { /** * 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; static final @Nullable String MIN_SPRING_VERSION = getSpringVersion(); diff --git a/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java b/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java index 5b670141e8..80af056123 100644 --- a/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java +++ b/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java @@ -31,7 +31,7 @@ import org.springframework.util.Assert; */ 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; diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java index b33961aa81..dec9baba73 100644 --- a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java +++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java @@ -31,7 +31,7 @@ import org.springframework.util.ObjectUtils; */ public class SecurityContextImpl implements SecurityContext { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private @Nullable Authentication authentication; diff --git a/core/src/main/java/org/springframework/security/core/session/ReactiveSessionInformation.java b/core/src/main/java/org/springframework/security/core/session/ReactiveSessionInformation.java index bd62f95309..8407f9ee2d 100644 --- a/core/src/main/java/org/springframework/security/core/session/ReactiveSessionInformation.java +++ b/core/src/main/java/org/springframework/security/core/session/ReactiveSessionInformation.java @@ -28,7 +28,7 @@ import org.springframework.util.Assert; public class ReactiveSessionInformation implements Serializable { @Serial - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private Instant lastAccessTime; diff --git a/core/src/main/java/org/springframework/security/core/session/SessionInformation.java b/core/src/main/java/org/springframework/security/core/session/SessionInformation.java index 54b05bbbb0..2dce53c670 100644 --- a/core/src/main/java/org/springframework/security/core/session/SessionInformation.java +++ b/core/src/main/java/org/springframework/security/core/session/SessionInformation.java @@ -39,7 +39,7 @@ import org.springframework.util.Assert; */ public class SessionInformation implements Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private Date lastRequest; diff --git a/core/src/main/java/org/springframework/security/core/userdetails/User.java b/core/src/main/java/org/springframework/security/core/userdetails/User.java index 3b9a871ba0..368210f726 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/User.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/User.java @@ -63,7 +63,7 @@ import org.springframework.util.Assert; */ 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); @@ -304,7 +304,7 @@ public class User implements UserDetails, CredentialsContainer { private static class AuthorityComparator implements Comparator, Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; @Override public int compare(GrantedAuthority g1, GrantedAuthority g2) { diff --git a/core/src/main/java/org/springframework/security/provisioning/MutableUser.java b/core/src/main/java/org/springframework/security/provisioning/MutableUser.java index b8a41836f3..91eb330846 100644 --- a/core/src/main/java/org/springframework/security/provisioning/MutableUser.java +++ b/core/src/main/java/org/springframework/security/provisioning/MutableUser.java @@ -30,7 +30,7 @@ import org.springframework.security.core.userdetails.UserDetails; */ class MutableUser implements MutableUserDetails { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private @Nullable String password; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java index 2c70b4f425..46be70bb02 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java @@ -31,7 +31,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; */ public class InetOrgPerson extends Person { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private String carLicense; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java index a0ef3b333b..f02163763d 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java @@ -49,7 +49,7 @@ import org.springframework.util.Assert; */ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private String dn; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java index 5dbc580cf8..0e6c226614 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java @@ -35,7 +35,7 @@ import org.springframework.util.Assert; */ public class Person extends LdapUserDetailsImpl { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private String givenName; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClient.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClient.java index 9ab0b93670..89a320941c 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClient.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClient.java @@ -43,7 +43,7 @@ import org.springframework.util.Assert; */ public class OAuth2AuthorizedClient implements Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final ClientRegistration clientRegistration; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientId.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientId.java index c36a0987b8..cac5df5231 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientId.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientId.java @@ -33,7 +33,7 @@ import org.springframework.util.Assert; */ 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; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthenticationToken.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthenticationToken.java index 4ec8642499..ac2c9123e6 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthenticationToken.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthenticationToken.java @@ -43,7 +43,7 @@ import org.springframework.util.Assert; */ public class OAuth2AuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final OAuth2User principal; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthorizationCodeAuthenticationToken.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthorizationCodeAuthenticationToken.java index 742c3eb039..c759253aef 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthorizationCodeAuthenticationToken.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthorizationCodeAuthenticationToken.java @@ -43,7 +43,7 @@ import org.springframework.util.Assert; */ public class OAuth2AuthorizationCodeAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private Map additionalParameters = new HashMap<>(); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationToken.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationToken.java index 170865ac5b..eba1c73bf5 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationToken.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationToken.java @@ -46,7 +46,7 @@ import org.springframework.util.Assert; */ public class OAuth2LoginAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private OAuth2User principal; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java index 1e16d5e942..ca2fcf7f65 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java @@ -53,7 +53,7 @@ import org.springframework.util.StringUtils; */ public final class ClientRegistration implements Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private String registrationId; @@ -219,7 +219,7 @@ public final class ClientRegistration 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; @@ -293,7 +293,7 @@ public final class ClientRegistration 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; @@ -340,7 +340,7 @@ public final class ClientRegistration 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); diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AbstractOAuth2Token.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AbstractOAuth2Token.java index c79cda3c06..b4c9f8162a 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AbstractOAuth2Token.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AbstractOAuth2Token.java @@ -34,7 +34,7 @@ import org.springframework.util.Assert; */ 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; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthenticationMethod.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthenticationMethod.java index 21160139ef..7824a76741 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthenticationMethod.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthenticationMethod.java @@ -32,7 +32,7 @@ import org.springframework.util.Assert; */ 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"); diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthorizationGrantType.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthorizationGrantType.java index 419382121e..2ec9ff56d0 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthorizationGrantType.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthorizationGrantType.java @@ -39,7 +39,7 @@ import org.springframework.util.Assert; */ 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"); diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClientAuthenticationMethod.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClientAuthenticationMethod.java index 33516fc3f7..9a7bd6b70c 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClientAuthenticationMethod.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClientAuthenticationMethod.java @@ -33,7 +33,7 @@ import org.springframework.util.Assert; */ public final class ClientAuthenticationMethod implements Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; /** * @since 5.5 diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2AccessToken.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2AccessToken.java index 6dd092c3de..a89159c273 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2AccessToken.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2AccessToken.java @@ -103,7 +103,7 @@ public class OAuth2AccessToken extends AbstractOAuth2Token { */ 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"); diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2Error.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2Error.java index 17605cc3e0..d23bb74a26 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2Error.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2Error.java @@ -38,7 +38,7 @@ import org.springframework.util.Assert; */ public class OAuth2Error implements Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final String errorCode; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationExchange.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationExchange.java index 75b28f9371..d623093e4e 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationExchange.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationExchange.java @@ -34,7 +34,7 @@ import org.springframework.util.Assert; public final class OAuth2AuthorizationExchange implements Serializable { @Serial - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final OAuth2AuthorizationRequest authorizationRequest; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java index 2eef48077c..b0a6f81793 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java @@ -54,7 +54,7 @@ import org.springframework.web.util.UriUtils; */ public final class OAuth2AuthorizationRequest implements Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private String authorizationUri; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponse.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponse.java index 23af3389da..5c3abcfcd8 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponse.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponse.java @@ -38,7 +38,7 @@ import org.springframework.util.StringUtils; public final class OAuth2AuthorizationResponse implements Serializable { @Serial - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private String redirectUri; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponseType.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponseType.java index cf321eaf68..0ce61d019a 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponseType.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponseType.java @@ -37,7 +37,7 @@ import org.springframework.util.Assert; */ 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"); diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/OidcUserInfo.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/OidcUserInfo.java index d62f0bc47f..0fd3f40cfa 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/OidcUserInfo.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/OidcUserInfo.java @@ -48,7 +48,7 @@ import org.springframework.util.Assert; */ public class OidcUserInfo implements StandardClaimAccessor, Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final Map claims; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/DefaultOAuth2User.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/DefaultOAuth2User.java index 4ce5230f04..edf9eb1201 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/DefaultOAuth2User.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/DefaultOAuth2User.java @@ -50,7 +50,7 @@ import org.springframework.util.Assert; */ public class DefaultOAuth2User implements OAuth2User, Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final Set authorities; diff --git a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/OAuth2UserAuthority.java b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/OAuth2UserAuthority.java index b088fc9594..f90323558e 100644 --- a/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/OAuth2UserAuthority.java +++ b/oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/OAuth2UserAuthority.java @@ -36,7 +36,7 @@ import org.springframework.util.Assert; */ public class OAuth2UserAuthority implements GrantedAuthority { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final String authority; diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/AbstractOAuth2TokenAuthenticationToken.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/AbstractOAuth2TokenAuthenticationToken.java index 6879f60021..0fe0bb1ad1 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/AbstractOAuth2TokenAuthenticationToken.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/AbstractOAuth2TokenAuthenticationToken.java @@ -48,7 +48,7 @@ import org.springframework.util.Assert; public abstract class AbstractOAuth2TokenAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private Object principal; diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthentication.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthentication.java index 3193cf90a3..7c3900b5f6 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthentication.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthentication.java @@ -38,7 +38,7 @@ import org.springframework.util.Assert; @Transient public class BearerTokenAuthentication extends AbstractOAuth2TokenAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final Map attributes; diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthenticationToken.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthenticationToken.java index 74647c780e..b1136b44ad 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthenticationToken.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthenticationToken.java @@ -37,7 +37,7 @@ import org.springframework.util.Assert; */ public class BearerTokenAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final String token; diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java index 7c5b610454..90b878260b 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java @@ -36,7 +36,7 @@ import org.springframework.security.oauth2.jwt.Jwt; @Transient public class JwtAuthenticationToken extends AbstractOAuth2TokenAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final String name; diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/core/Saml2Error.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/core/Saml2Error.java index 8035e66db0..1db55c202c 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/core/Saml2Error.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/core/Saml2Error.java @@ -34,7 +34,7 @@ import org.springframework.util.Assert; */ public class Saml2Error implements Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final String errorCode; diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/AbstractSaml2AuthenticationRequest.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/AbstractSaml2AuthenticationRequest.java index adb097c4c2..8d0c4fd0fc 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/AbstractSaml2AuthenticationRequest.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/AbstractSaml2AuthenticationRequest.java @@ -39,7 +39,7 @@ import org.springframework.util.Assert; */ 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; diff --git a/web/src/main/java/org/springframework/security/web/UnreachableFilterChainException.java b/web/src/main/java/org/springframework/security/web/UnreachableFilterChainException.java index 8580edb9dc..9c25a77d04 100644 --- a/web/src/main/java/org/springframework/security/web/UnreachableFilterChainException.java +++ b/web/src/main/java/org/springframework/security/web/UnreachableFilterChainException.java @@ -26,7 +26,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; */ public class UnreachableFilterChainException extends IllegalArgumentException { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final SecurityFilterChain filterChain; diff --git a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java index 9d038cc9e0..2987020829 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java @@ -32,7 +32,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; */ public class WebAuthenticationDetails implements Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final String remoteAddress; diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationToken.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationToken.java index bc4f6ab13c..abb2d54ba9 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationToken.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationToken.java @@ -31,7 +31,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; */ public class PreAuthenticatedAuthenticationToken extends AbstractAuthenticationToken { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final Object principal; diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java index 37f63279be..282e3a287f 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java @@ -39,7 +39,7 @@ import org.springframework.security.web.authentication.WebAuthenticationDetails; public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails extends WebAuthenticationDetails implements GrantedAuthoritiesContainer { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final List authorities; diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java index 4be683e554..793921529e 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java @@ -33,7 +33,7 @@ import org.springframework.util.Assert; */ 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; diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java index 6e78190381..16d7d087c3 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java @@ -62,7 +62,7 @@ import org.springframework.web.util.UriComponentsBuilder; */ 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); diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java index 310d48bd2b..dad689caf5 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java @@ -29,7 +29,7 @@ import org.springframework.security.core.SpringSecurityCoreVersion; */ public class SavedCookie implements Serializable { - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + private static final long serialVersionUID = 620L; private final String name;