Merge branch '2.5.x'

Closes gh-27088
3 years ago · 674b9fb8fb
parent e67609959b 8f9652c011
commit 674b9fb8fb
1 changed files with 2 additions and 2 deletions
--- a/gradle.properties
+++ b/gradle.properties
@ -4,7 +4,7 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
-kotlinVersion=1.5.10
+kotlinVersion=1.5.20
-tomcatVersion=9.0.46
+tomcatVersion=9.0.48
 kotlin.stdlib.default.dependency=false