Merge branch '6.4.x'

2025-07-07 03:02:23 +00:00 · 2025-02-13 17:18:03 -07:00 · 2025-02-13 17:18:03 -07:00 · 666d3a4af6
commit 666d3a4af6
parent 839269dbf5 879b44f9a1
10 changed files with 1 additions and 0 deletions
--- a/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
+++ b/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
@ -633,6 +633,7 @@ class SpringSecurityCoreVersionSerializableTests {
 			webAuthnAuthentication.setDetails(details);
 			return webAuthnAuthentication;
 		});
+		// @formatter:on
 	}

 	@ParameterizedTest
--- a/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.AuthenticatorTransport.serialized
+++ b/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.AuthenticatorTransport.serialized
--- a/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.CredProtectAuthenticationExtensionsClientInput$CredProtect.serialized
+++ b/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.CredProtectAuthenticationExtensionsClientInput$CredProtect.serialized
--- a/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.CredProtectAuthenticationExtensionsClientInput.serialized
+++ b/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.CredProtectAuthenticationExtensionsClientInput.serialized
--- a/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.ImmutableAuthenticationExtensionsClientInput.serialized
+++ b/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.ImmutableAuthenticationExtensionsClientInput.serialized
--- a/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.ImmutableAuthenticationExtensionsClientInputs.serialized
+++ b/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.ImmutableAuthenticationExtensionsClientInputs.serialized
--- a/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.PublicKeyCredentialDescriptor.serialized
+++ b/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.PublicKeyCredentialDescriptor.serialized
--- a/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.PublicKeyCredentialRequestOptions.serialized
+++ b/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.PublicKeyCredentialRequestOptions.serialized
--- a/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.PublicKeyCredentialType.serialized
+++ b/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.PublicKeyCredentialType.serialized
--- a/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.UserVerificationRequirement.serialized
+++ b/config/src/test/resources/serialized/6.4.x/org.springframework.security.web.webauthn.api.UserVerificationRequirement.serialized