Prechádzať zdrojové kódy

Deprecate SERIAL_VERSION_UID

Closes gh-17623
Josh Cummings 2 týždňov pred
rodič
commit
6d1a886f92
51 zmenil súbory, kde vykonal 57 pridanie a 54 odobranie
  1. 1 1
      cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java
  2. 1 1
      cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
  3. 1 1
      cas/src/main/java/org/springframework/security/cas/authentication/CasServiceTicketAuthenticationToken.java
  4. 1 1
      config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
  5. 1 1
      core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
  6. 1 1
      core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
  7. 1 1
      core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java
  8. 1 1
      core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java
  9. 1 1
      core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java
  10. 3 0
      core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
  11. 1 1
      core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java
  12. 1 1
      core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
  13. 1 1
      core/src/main/java/org/springframework/security/core/session/ReactiveSessionInformation.java
  14. 1 1
      core/src/main/java/org/springframework/security/core/session/SessionInformation.java
  15. 2 2
      core/src/main/java/org/springframework/security/core/userdetails/User.java
  16. 1 1
      core/src/main/java/org/springframework/security/provisioning/MutableUser.java
  17. 1 1
      ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java
  18. 1 1
      ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java
  19. 1 1
      ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java
  20. 1 1
      oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClient.java
  21. 1 1
      oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2AuthorizedClientId.java
  22. 1 1
      oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthenticationToken.java
  23. 1 1
      oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2AuthorizationCodeAuthenticationToken.java
  24. 1 1
      oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationToken.java
  25. 4 4
      oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/registration/ClientRegistration.java
  26. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AbstractOAuth2Token.java
  27. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthenticationMethod.java
  28. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/AuthorizationGrantType.java
  29. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClientAuthenticationMethod.java
  30. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2AccessToken.java
  31. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/OAuth2Error.java
  32. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationExchange.java
  33. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java
  34. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponse.java
  35. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationResponseType.java
  36. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/OidcUserInfo.java
  37. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/DefaultOAuth2User.java
  38. 1 1
      oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/user/OAuth2UserAuthority.java
  39. 1 1
      oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/AbstractOAuth2TokenAuthenticationToken.java
  40. 1 1
      oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthentication.java
  41. 1 1
      oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/BearerTokenAuthenticationToken.java
  42. 1 1
      oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationToken.java
  43. 1 1
      saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/core/Saml2Error.java
  44. 1 1
      saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/AbstractSaml2AuthenticationRequest.java
  45. 1 1
      web/src/main/java/org/springframework/security/web/UnreachableFilterChainException.java
  46. 1 1
      web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java
  47. 1 1
      web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationToken.java
  48. 1 1
      web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java
  49. 1 1
      web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java
  50. 1 1
      web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java
  51. 1 1
      web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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());
 

+ 1 - 1
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<? extends Authentication> originalAuthentication;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 3 - 0
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();

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 2 - 2
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<GrantedAuthority>, Serializable {
 
-		private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+		private static final long serialVersionUID = 620L;
 
 		@Override
 		public int compare(GrantedAuthority g1, GrantedAuthority g2) {

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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<String, Object> additionalParameters = new HashMap<>();
 

+ 1 - 1
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;
 

+ 4 - 4
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);
 

+ 1 - 1
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;
 

+ 1 - 1
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");
 

+ 1 - 1
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");
 

+ 1 - 1
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

+ 1 - 1
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");
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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");
 

+ 1 - 1
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<String, Object> claims;
 

+ 1 - 1
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<GrantedAuthority> authorities;
 

+ 1 - 1
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;
 

+ 1 - 1
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<T extends OAuth2Token>
 		extends AbstractAuthenticationToken {
 
-	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = 620L;
 
 	private Object principal;
 

+ 1 - 1
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<OAuth2AccessToken> {
 
-	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = 620L;
 
 	private final Map<String, Object> attributes;
 

+ 1 - 1
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;
 

+ 1 - 1
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<Jwt> {
 
-	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = 620L;
 
 	private final String name;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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<GrantedAuthority> authorities;
 

+ 1 - 1
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;
 

+ 1 - 1
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);
 

+ 1 - 1
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;