Merge branch '2.1.x'

Closes gh-17478
7 years ago · acfb7f28f4
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
@ -37,7 +37,7 @@ configuration).
				@@ -37,7 +37,7 @@ configuration).
 [[getting-started-system-requirements]]
 == System Requirements
 Spring Boot {spring-boot-version} requires https://www.java.com[Java 8] and is compatible
-up to Java 11 (included). {spring-reference}[Spring Framework {spring-framework-version}]
+up to Java 12 (included). {spring-reference}[Spring Framework {spring-framework-version}]
 or above is also required.

 Explicit build support is provided for the following build tools: