Merge branch '2.5.x'

Closes gh-27088
This commit is contained in:
Phillip Webb 2021-06-24 10:45:25 -07:00
commit 674b9fb8fb

View File

@ -4,7 +4,7 @@ org.gradle.caching=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.5.10
tomcatVersion=9.0.46
kotlinVersion=1.5.20
tomcatVersion=9.0.48
kotlin.stdlib.default.dependency=false