Skip to content

Commit

Permalink
Merge pull request #12606 from playframework/update/spring-core-6.1.6
Browse files Browse the repository at this point in the history
spring-core 6.1.6 (was 6.0.19)
  • Loading branch information
mkurz committed May 4, 2024
2 parents baa8234 + c0c352e commit 1525d3f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Instead of enabling "direct field access" for all forms, you can enable it only

@[create](code/javaguide/forms/JavaFormsDirectFieldAccess.java)

> **Note:** The underlying binding is done using [Spring data binder](https://docs.spring.io/spring-framework/reference/6.0/core/validation.html).
> **Note:** The underlying binding is done using [Spring data binder](https://docs.spring.io/spring-framework/reference/6.1/core/validation.html).
This form can generate a `User` result value from a `HashMap<String,String>` for the text data and from a `Map<String, FilePart<?>>` for the file data:

Expand Down Expand Up @@ -102,7 +102,7 @@ When the binding fails an array of errors keys is created, the first one defined

["error.invalid.<fieldName>", "error.invalid.<type>", "error.invalid"]

The errors keys are created by [Spring DefaultMessageCodesResolver](https://docs.spring.io/spring-framework/docs/6.0.19/javadoc-api/org/springframework/validation/DefaultMessageCodesResolver.html), the root "typeMismatch" is replaced by "error.invalid".
The errors keys are created by [Spring DefaultMessageCodesResolver](https://docs.spring.io/spring-framework/docs/6.1.6/javadoc-api/org/springframework/validation/DefaultMessageCodesResolver.html), the root "typeMismatch" is replaced by "error.invalid".

## Advanced validation

Expand Down
8 changes: 3 additions & 5 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ object Dependencies {
}
})

val springFrameworkVersion = "6.0.19"
val springFrameworkVersion = "6.1.6"

val javaDeps = Seq(
// Used by the Java routing DSL
Expand All @@ -125,11 +125,9 @@ object Dependencies {
.exclude("org.springframework", "spring-beans")
.exclude("org.springframework", "spring-core")
.exclude("org.springframework", "spring-expression")
.exclude("org.springframework", "spring-asm"),
.exclude("io.micrometer", "micrometer-observation"),
("org.springframework" % "spring-core" % springFrameworkVersion)
.exclude("org.springframework", "spring-asm")
.exclude("org.springframework", "spring-jcl")
.exclude("commons-logging", "commons-logging"),
.exclude("org.springframework", "spring-jcl"),
("org.springframework" % "spring-beans" % springFrameworkVersion)
.exclude("org.springframework", "spring-core")
) ++ specs2Deps.map(_ % Test)
Expand Down

0 comments on commit 1525d3f

Please sign in to comment.