Merge pull request #10829 from erichelgeson/3.2.x

Update Tomcat to 8.5.23

Author: graemerocher

build.gradle

@@ -55,7 +55,8 @@ ext {
     concurrentlinkedhashmapVersion = "1.4.2"
     cglibVersion = "2.2.2"
     objenesisVersion = "1.4"
-    tomcatVersion = "8.5.2"
+    tomcatVersion = "8.5.23"
+    tomcatLog4jVersion = "8.5.2"
     servletApiVersion = "3.0.1"
 
     isJava8Compatible = org.gradle.api.JavaVersion.current().isJava8Compatible()

grails-plugin-datasource/build.gradle

@@ -10,7 +10,7 @@ dependencies {
     }
 
     compile "org.apache.tomcat:tomcat-jdbc:$tomcatVersion"
-    runtime "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatVersion"
+    runtime "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatLog4jVersion"
 
     compile project(":grails-core")
 }