Skip to content

Bump org.springframework.data:spring-data-bom from 2025.1.0 to 2025.1.1 #18312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rwinch merged 2 commits into from
Dec 15, 2025
+14 −3
Merged

Bump org.springframework.data:spring-data-bom from 2025.1.0 to 2025.1.1 #18312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5fffe3
Bump org.springframework:spring-framework-bom from 7.0.1 to 7.0.2
dependabot[bot] Dec 15, 2025
2fb63af
Bump org.springframework.data:spring-data-bom from 2025.1.0 to 2025.1.1
dependabot[bot] Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ class ServerJwtDslTests {
}

class NullConverter: Converter<Jwt, Mono<AbstractAuthenticationToken>> {
override fun convert(source: Jwt): Mono<AbstractAuthenticationToken>? {
override fun convert(source: Jwt): Mono<AbstractAuthenticationToken> {
return Mono.empty()
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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"
Expand Down
11 changes: 11 additions & 0 deletions ...rg/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ private GenericHttpMessageConverterAdapter(GenericHttpMessageConverter<T> 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);
Expand Down Expand Up @@ -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);
}

}

}
Loading