Merge branch '1.1.x'

2015-02-17 10:01:39 +00:00
parent 34ede2f31f 11e0444814
commit d87bf707a7
3 changed files with 9 additions and 9 deletions
--- a/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -685,7 +685,7 @@ property, e.g. for a simple webapp or service:
 [source,xml,indent=0,subs="verbatim,quotes,attributes"]
 ----
 	<properties>
-		<tomcat.version>7.0.57</tomcat.version>
+		<tomcat.version>7.0.59</tomcat.version>
 	</properties>
 	<dependencies>
 		...
@@ -711,7 +711,7 @@ e.g. for a simple webapp or service:
 		resolutionStrategy {
 			eachDependency {
 				if (it.requested.group == 'org.apache.tomcat.embed') {
-					it.useVersion '7.0.57'
+					it.useVersion '7.0.59'
 				}
 			}
 		}