diff --git a/.gitattributes b/.gitattributes index f4454823cd..f4fe653ceb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,3 +15,4 @@ *.otg binary *.png binary *.hsx binary +*.serialized binary diff --git a/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java b/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java index 544f9a3a7f..66358af6fd 100644 --- a/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java +++ b/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java @@ -227,7 +227,7 @@ class SpringSecurityCoreVersionSerializableTests { @Disabled("This method should only be used to serialize the classes once") void serializeCurrentVersionClasses(Class clazz) throws Exception { Files.createDirectories(currentVersionFolder); - Path filePath = Paths.get(currentVersionFolder.toAbsolutePath() + "/" + clazz.getName()); + Path filePath = Paths.get(currentVersionFolder.toAbsolutePath() + "/" + clazz.getName() + ".serialized"); File file = filePath.toFile(); if (file.exists()) { return; @@ -253,7 +253,7 @@ class SpringSecurityCoreVersionSerializableTests { try (FileInputStream fileInputStream = new FileInputStream(filePath.toFile()); ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream)) { Object obj = objectInputStream.readObject(); - Class clazz = Class.forName(filePath.getFileName().toString()); + Class clazz = Class.forName(filePath.getFileName().toString().replace(".serialized", "")); assertThat(obj).isInstanceOf(clazz); } catch (IOException | ClassNotFoundException ex) { diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.access.intercept.RunAsUserToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.access.intercept.RunAsUserToken.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.access.intercept.RunAsUserToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.access.intercept.RunAsUserToken.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.RememberMeAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.RememberMeAuthenticationToken.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.RememberMeAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.RememberMeAuthenticationToken.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.UsernamePasswordAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.UsernamePasswordAuthenticationToken.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.UsernamePasswordAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.UsernamePasswordAuthenticationToken.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasAuthenticationToken.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasAuthenticationToken.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasGrantedAuthority b/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasGrantedAuthority.serialized similarity index 76% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasGrantedAuthority rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasGrantedAuthority.serialized index 60064abf12..b34fd8743b 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasGrantedAuthority and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.authentication.jaas.JaasGrantedAuthority.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAssertionAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAssertionAuthenticationToken.serialized similarity index 88% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAssertionAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAssertionAuthenticationToken.serialized index f284fb248f..5140f92f12 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAssertionAuthenticationToken and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAssertionAuthenticationToken.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAuthenticationToken.serialized similarity index 93% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAuthenticationToken.serialized index 8fac54547b..bf07174c88 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAuthenticationToken and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasAuthenticationToken.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasServiceTicketAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasServiceTicketAuthenticationToken.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasServiceTicketAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.cas.authentication.CasServiceTicketAuthenticationToken.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.authority.SimpleGrantedAuthority b/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.authority.SimpleGrantedAuthority.serialized similarity index 50% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.core.authority.SimpleGrantedAuthority rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.core.authority.SimpleGrantedAuthority.serialized index f73bd3b7ee..d38fc2b4e7 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.authority.SimpleGrantedAuthority and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.authority.SimpleGrantedAuthority.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.context.SecurityContextImpl b/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.context.SecurityContextImpl.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.core.context.SecurityContextImpl rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.core.context.SecurityContextImpl.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.session.SessionInformation b/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.session.SessionInformation.serialized similarity index 97% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.core.session.SessionInformation rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.core.session.SessionInformation.serialized index 0455367e10..2c4f5842d8 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.session.SessionInformation and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.session.SessionInformation.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User$AuthorityComparator b/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User$AuthorityComparator.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User$AuthorityComparator rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User$AuthorityComparator.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User b/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User.serialized similarity index 64% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User.serialized index 1f66865ff4..e5f1c7ac5a 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.core.userdetails.User.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.InetOrgPerson b/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.InetOrgPerson.serialized similarity index 68% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.InetOrgPerson rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.InetOrgPerson.serialized index 4c46fbb64c..1fdc5e294b 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.InetOrgPerson and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.InetOrgPerson.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.LdapUserDetailsImpl b/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.LdapUserDetailsImpl.serialized similarity index 69% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.LdapUserDetailsImpl rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.LdapUserDetailsImpl.serialized index ce77d1eb3f..d458431d10 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.LdapUserDetailsImpl and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.LdapUserDetailsImpl.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.Person b/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.Person.serialized similarity index 67% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.Person rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.Person.serialized index d5e4fea9a9..be34ba2770 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.Person and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.ldap.userdetails.Person.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClient b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClient.serialized similarity index 94% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClient rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClient.serialized index 643502ab5f..425c18f1d5 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClient and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClient.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClientId b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClientId.serialized similarity index 71% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClientId rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClientId.serialized index 6bdf42c805..86896b4a89 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClientId and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.OAuth2AuthorizedClientId.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken.serialized similarity index 86% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken.serialized index 29e5e02bf3..bba5cb1fb7 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken.serialized similarity index 73% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken.serialized index b60916dc31..15bd7125c3 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.registration.ClientRegistration$Builder b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.registration.ClientRegistration$Builder.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.registration.ClientRegistration$Builder rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.registration.ClientRegistration$Builder.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.registration.ClientRegistration b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.registration.ClientRegistration.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.registration.ClientRegistration rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.client.registration.ClientRegistration.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthenticationMethod b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthenticationMethod.serialized similarity index 53% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthenticationMethod rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthenticationMethod.serialized index 34f5fda9c0..814b169859 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthenticationMethod and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthenticationMethod.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthorizationGrantType b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthorizationGrantType.serialized similarity index 52% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthorizationGrantType rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthorizationGrantType.serialized index f0102462ab..597c1b0563 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthorizationGrantType and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.AuthorizationGrantType.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod deleted file mode 100644 index de13b38119..0000000000 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod and /dev/null differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod.serialized b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod.serialized new file mode 100644 index 0000000000..69c3817af4 Binary files /dev/null and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.ClientAuthenticationMethod.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2AccessToken$TokenType b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2AccessToken$TokenType.serialized similarity index 51% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2AccessToken$TokenType rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2AccessToken$TokenType.serialized index 1767bc4b68..c7931b5d96 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2AccessToken$TokenType and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2AccessToken$TokenType.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2Error b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2Error.serialized similarity index 76% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2Error rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2Error.serialized index 1fc691bc3e..e4d9af468f 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2Error and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.OAuth2Error.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationExchange b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationExchange.serialized similarity index 92% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationExchange rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationExchange.serialized index b5694659b1..cd379531f3 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationExchange and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationExchange.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse.serialized similarity index 68% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse.serialized index 3984149368..dfca04e4c0 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponseType b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponseType.serialized similarity index 92% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponseType rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponseType.serialized index baf677ce60..19b50e2e22 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponseType and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponseType.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.oidc.OidcUserInfo b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.oidc.OidcUserInfo.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.oidc.OidcUserInfo rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.oidc.OidcUserInfo.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.user.DefaultOAuth2User b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.user.DefaultOAuth2User.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.user.DefaultOAuth2User rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.user.DefaultOAuth2User.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.user.OAuth2UserAuthority b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.user.OAuth2UserAuthority.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.user.OAuth2UserAuthority rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.core.user.OAuth2UserAuthority.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken.serialized similarity index 91% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken.serialized index 62d9f91556..247c749a7e 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthentication b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthentication.serialized similarity index 95% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthentication rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthentication.serialized index bfed535d8e..f97b7aa618 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthentication and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthentication.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken.serialized similarity index 90% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken.serialized index 1e0c8c6a08..b159841285 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.BearerTokenAuthenticationToken.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken.serialized similarity index 95% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken.serialized index f265989af4..d0f1513f70 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.provisioning.MutableUser b/config/src/test/resources/serialized/6.2.x/org.springframework.security.provisioning.MutableUser.serialized similarity index 66% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.provisioning.MutableUser rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.provisioning.MutableUser.serialized index 9dbb80e047..6dd8705b12 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.provisioning.MutableUser and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.provisioning.MutableUser.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error b/config/src/test/resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error deleted file mode 100644 index 2a20f99e8b..0000000000 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error and /dev/null differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error.serialized b/config/src/test/resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error.serialized new file mode 100644 index 0000000000..16f0fe2e80 Binary files /dev/null and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.saml2.core.Saml2Error.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.WebAuthenticationDetails b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.WebAuthenticationDetails.serialized similarity index 74% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.WebAuthenticationDetails rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.WebAuthenticationDetails.serialized index 3b0b894c16..058fa3d088 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.WebAuthenticationDetails and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.WebAuthenticationDetails.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken.serialized similarity index 100% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken.serialized diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.serialized similarity index 66% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.serialized index ff35693be1..274a71a167 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.preauth.PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority.serialized similarity index 94% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority.serialized index b2ac7b88fa..bbe2600023 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest deleted file mode 100644 index 72cdfcfb1b..0000000000 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest and /dev/null differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest.serialized b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest.serialized new file mode 100644 index 0000000000..7e19a96c7c Binary files /dev/null and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.DefaultSavedRequest.serialized differ diff --git a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.SavedCookie b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.SavedCookie.serialized similarity index 51% rename from config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.SavedCookie rename to config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.SavedCookie.serialized index 2e07a50608..f3eccf83d0 100644 Binary files a/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.SavedCookie and b/config/src/test/resources/serialized/6.2.x/org.springframework.security.web.savedrequest.SavedCookie.serialized differ