Browse Source

Merge branch '5.2.x'

# Conflicts:
#	build.gradle
#	spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
pull/25991/head
Juergen Hoeller 4 years ago
parent
commit
3924947773
  1. 2
      build.gradle

2
build.gradle

@ -88,7 +88,7 @@ configure(allprojects) { project -> @@ -88,7 +88,7 @@ configure(allprojects) { project ->
entry 'jibx-run'
}
dependency "org.ogce:xpp3:1.1.6"
dependency "org.yaml:snakeyaml:1.26"
dependency "org.yaml:snakeyaml:1.27"
dependencySet(group: 'org.jetbrains.kotlinx', version: '1.0.0') {
entry 'kotlinx-serialization-core'
entry 'kotlinx-serialization-json'

Loading…
Cancel
Save