root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.2.x' 

# Conflicts:
#	framework-platform/framework-platform.gradle
This commit is contained in:
Juergen Hoeller 2025-08-22 23:07:29 +02:00
parent 56269d76e5 01b24f2644
commit acd68261e5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework-platform/framework-platform.gradle
View File

@ -20,7 +20,7 @@ dependencies {
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0"))
api(platform("org.junit:junit-bom:5.13.4")) api(platform("org.junit:junit-bom:5.13.4"))
api(platform("org.mockito:mockito-bom:5.18.0")) api(platform("org.mockito:mockito-bom:5.19.0"))
api(platform("tools.jackson:jackson-bom:3.0.0-rc8")) api(platform("tools.jackson:jackson-bom:3.0.0-rc8"))
constraints { constraints {
@ -31,7 +31,7 @@ dependencies {
api("com.google.code.findbugs:findbugs:3.0.1") api("com.google.code.findbugs:findbugs:3.0.1")
api("com.google.code.findbugs:jsr305:3.0.2") api("com.google.code.findbugs:jsr305:3.0.2")
api("com.google.code.gson:gson:2.13.1") api("com.google.code.gson:gson:2.13.1")
api("com.google.protobuf:protobuf-java-util:4.31.1") api("com.google.protobuf:protobuf-java-util:4.32.0")
api("com.h2database:h2:2.3.232") api("com.h2database:h2:2.3.232")
api("com.jayway.jsonpath:json-path:2.9.0") api("com.jayway.jsonpath:json-path:2.9.0")
api("com.networknt:json-schema-validator:1.5.3") api("com.networknt:json-schema-validator:1.5.3")
@ -124,7 +124,7 @@ dependencies {
api("org.hibernate.orm:hibernate-core:7.1.0.Final") api("org.hibernate.orm:hibernate-core:7.1.0.Final")
api("org.hibernate.validator:hibernate-validator:9.0.1.Final") api("org.hibernate.validator:hibernate-validator:9.0.1.Final")
api("org.hsqldb:hsqldb:2.7.4") api("org.hsqldb:hsqldb:2.7.4")
api("org.htmlunit:htmlunit:4.14.0") api("org.htmlunit:htmlunit:4.15.0")
api("org.javamoney:moneta:1.4.4") api("org.javamoney:moneta:1.4.4")
api("org.jboss.logging:jboss-logging:3.6.1.Final") api("org.jboss.logging:jboss-logging:3.6.1.Final")
api("org.jruby:jruby:10.0.2.0") api("org.jruby:jruby:10.0.2.0")
@ -135,7 +135,7 @@ dependencies {
api("org.python:jython-standalone:2.7.4") api("org.python:jython-standalone:2.7.4")
api("org.quartz-scheduler:quartz:2.3.2") api("org.quartz-scheduler:quartz:2.3.2")
api("org.reactivestreams:reactive-streams:1.0.4") api("org.reactivestreams:reactive-streams:1.0.4")
api("org.seleniumhq.selenium:htmlunit3-driver:4.34.0") api("org.seleniumhq.selenium:htmlunit3-driver:4.35.0")
api("org.seleniumhq.selenium:selenium-java:4.35.0") api("org.seleniumhq.selenium:selenium-java:4.35.0")
api("org.skyscreamer:jsonassert:2.0-rc1") api("org.skyscreamer:jsonassert:2.0-rc1")
api("org.testng:testng:7.11.0") api("org.testng:testng:7.11.0")

2
spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java
View File

@ -272,7 +272,7 @@ public class StandardEvaluationContext implements EvaluationContext {
* @param constructorResolver the constructor resolver to remove * @param constructorResolver the constructor resolver to remove
* @return {@code true} if the constructor resolver was removed, {@code false} * @return {@code true} if the constructor resolver was removed, {@code false}
* if the constructor resolver was not configured in this evaluation context * if the constructor resolver was not configured in this evaluation context
< * @see #getConstructorResolvers() * @see #getConstructorResolvers()
* @see #setConstructorResolvers(List) * @see #setConstructorResolvers(List)
* @see #addConstructorResolver(ConstructorResolver) * @see #addConstructorResolver(ConstructorResolver)
*/ */