Skip to content

Commit acd6826

Browse files
committed
Merge branch '6.2.x'
# Conflicts: # framework-platform/framework-platform.gradle
2 parents 56269d7 + 01b24f2 commit acd6826

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

framework-platform/framework-platform.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0"))
2222
api(platform("org.junit:junit-bom:5.13.4"))
23-
api(platform("org.mockito:mockito-bom:5.18.0"))
23+
api(platform("org.mockito:mockito-bom:5.19.0"))
2424
api(platform("tools.jackson:jackson-bom:3.0.0-rc8"))
2525

2626
constraints {
@@ -31,7 +31,7 @@ dependencies {
3131
api("com.google.code.findbugs:findbugs:3.0.1")
3232
api("com.google.code.findbugs:jsr305:3.0.2")
3333
api("com.google.code.gson:gson:2.13.1")
34-
api("com.google.protobuf:protobuf-java-util:4.31.1")
34+
api("com.google.protobuf:protobuf-java-util:4.32.0")
3535
api("com.h2database:h2:2.3.232")
3636
api("com.jayway.jsonpath:json-path:2.9.0")
3737
api("com.networknt:json-schema-validator:1.5.3")
@@ -124,7 +124,7 @@ dependencies {
124124
api("org.hibernate.orm:hibernate-core:7.1.0.Final")
125125
api("org.hibernate.validator:hibernate-validator:9.0.1.Final")
126126
api("org.hsqldb:hsqldb:2.7.4")
127-
api("org.htmlunit:htmlunit:4.14.0")
127+
api("org.htmlunit:htmlunit:4.15.0")
128128
api("org.javamoney:moneta:1.4.4")
129129
api("org.jboss.logging:jboss-logging:3.6.1.Final")
130130
api("org.jruby:jruby:10.0.2.0")
@@ -135,7 +135,7 @@ dependencies {
135135
api("org.python:jython-standalone:2.7.4")
136136
api("org.quartz-scheduler:quartz:2.3.2")
137137
api("org.reactivestreams:reactive-streams:1.0.4")
138-
api("org.seleniumhq.selenium:htmlunit3-driver:4.34.0")
138+
api("org.seleniumhq.selenium:htmlunit3-driver:4.35.0")
139139
api("org.seleniumhq.selenium:selenium-java:4.35.0")
140140
api("org.skyscreamer:jsonassert:2.0-rc1")
141141
api("org.testng:testng:7.11.0")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public void addConstructorResolver(ConstructorResolver constructorResolver) {
272272
* @param constructorResolver the constructor resolver to remove
273273
* @return {@code true} if the constructor resolver was removed, {@code false}
274274
* if the constructor resolver was not configured in this evaluation context
275-
< * @see #getConstructorResolvers()
275+
* @see #getConstructorResolvers()
276276
* @see #setConstructorResolvers(List)
277277
* @see #addConstructorResolver(ConstructorResolver)
278278
*/

0 commit comments

Comments
 (0)