Merge branch '1.2.x'

10 years ago · d266639c0a
parent cef02ae4b3 a717813c83
commit d266639c0a
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc
@ -37,7 +37,7 @@ diverge from the defaults.
 [[getting-started-system-requirements]]
 == System Requirements
 By default, Spring Boot {spring-boot-version} requires http://www.java.com[Java 7] and
-Spring Framework 4.1.3 or above. You can use Spring Boot with Java 6 with some additional
+Spring Framework 4.1.5 or above. You can use Spring Boot with Java 6 with some additional
 configuration. See <<howto.adoc#howto-use-java-6>> for more details. Explicit build support
 is provided for Maven (3.2+) and Gradle (1.12+).