Merge branch '2.1.x' into 2.2.x

grails · Apr 26, 2013 · 2185428 · 2185428
2 parents 49fa36e + ec9d58f
commit 2185428
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java b/...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
@@ -151,7 +151,7 @@ public Object doCall() {
                         registerDependencies(dependencyManager, "docs", docDependencies);
 
                         // dependencies needed during development, but not for deployment
-                        String tomcatVersion = "7.0.30";
+                        String tomcatVersion = "7.0.39";
                         ModuleRevisionId[] providedDependencies = {
                             ModuleRevisionId.newInstance("org.apache.tomcat.embed", "tomcat-embed-core", tomcatVersion),
                             ModuleRevisionId.newInstance("org.apache.tomcat.embed", "tomcat-embed-jasper",tomcatVersion),