From f5fffe303a30f844448f54992d13a935419ce102 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 16:00:24 +0000 Subject: [PATCH 1/2] Bump org.springframework:spring-framework-bom from 7.0.1 to 7.0.2 Includes fixes for Breaking Changes in Spring Framework 7.0.2: - spring-projects/spring-framework#35916 - spring-projects/spring-framework#35947 Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.1...v7.0.2) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-version: 7.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../security/config/web/server/ServerJwtDslTests.kt | 2 +- gradle/libs.versions.toml | 2 +- .../authentication/WebAuthnAuthenticationFilter.java | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt index d586b2290cb..e500eecba8d 100644 --- a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt +++ b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt @@ -275,7 +275,7 @@ class ServerJwtDslTests { } class NullConverter: Converter> { - override fun convert(source: Jwt): Mono? { + override fun convert(source: Jwt): Mono { return Mono.empty() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 250d18e13db..b5e6f4e5237 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ org-jetbrains-kotlin = "2.2.21" org-jetbrains-kotlinx = "1.10.2" org-mockito = "5.17.0" org-opensaml5 = "5.1.6" -org-springframework = "7.0.1" +org-springframework = "7.0.2" com-password4j = "1.8.4" [libraries] diff --git a/webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java b/webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java index c4016a1ef38..a1ae19f9205 100644 --- a/webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java +++ b/webauthn/src/main/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java @@ -174,6 +174,12 @@ private GenericHttpMessageConverterAdapter(GenericHttpMessageConverter delega this.delegate = delegate; } + @Override + public boolean canRead(ResolvableType type, @Nullable MediaType mediaType) { + Class clazz = type.resolve(); + return (clazz != null) ? canRead(clazz, mediaType) : canRead(mediaType); + } + @Override public boolean canRead(Class clazz, @Nullable MediaType mediaType) { return this.delegate.canRead(clazz, mediaType); @@ -206,6 +212,11 @@ public T read(ResolvableType type, HttpInputMessage inputMessage, @Nullable Map< return this.delegate.read(type.getType(), null, inputMessage); } + @Override + public boolean canWrite(ResolvableType targetType, Class valueClass, @Nullable MediaType mediaType) { + return this.delegate.canWrite(targetType.getType(), valueClass, mediaType); + } + } } From 2fb63af8ff70ffa49a0f211428f06316e1bdfb74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 16:00:56 +0000 Subject: [PATCH 2/2] Bump org.springframework.data:spring-data-bom from 2025.1.0 to 2025.1.1 Bumps [org.springframework.data:spring-data-bom](https://github.com/spring-projects/spring-data-bom) from 2025.1.0 to 2025.1.1. - [Release notes](https://github.com/spring-projects/spring-data-bom/releases) - [Commits](https://github.com/spring-projects/spring-data-bom/compare/2025.1.0...2025.1.1) --- updated-dependencies: - dependency-name: org.springframework.data:spring-data-bom dependency-version: 2025.1.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b5e6f4e5237..0bf271af667 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -81,7 +81,7 @@ org-seleniumhq-selenium-selenium-support = "org.seleniumhq.selenium:selenium-sup org-skyscreamer-jsonassert = "org.skyscreamer:jsonassert:1.5.3" org-slf4j-log4j-over-slf4j = "org.slf4j:log4j-over-slf4j:1.7.36" org-slf4j-slf4j-api = "org.slf4j:slf4j-api:2.0.17" -org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2025.1.0" +org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2025.1.1" org-springframework-ldap-spring-ldap-core = "org.springframework.ldap:spring-ldap-core:4.0.0" org-springframework-spring-framework-bom = { module = "org.springframework:spring-framework-bom", version.ref = "org-springframework" } org-synchronoss-cloud-nio-multipart-parser = "org.synchronoss.cloud:nio-multipart-parser:1.1.0"