Merge branch '2.1.x'

Closes gh-17478

Merge branch '2.1.x'
Closes gh-17478
acfb7f28 · Stephane Nicoll · 3c28622e · 852f4a28 · acfb7f28
Commit acfb7f28 authored Jul 10, 2019 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

getting-started.adoc ...t/spring-boot-docs/src/main/asciidoc/getting-started.adoc +1 -1

No files found.
--- 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).
 [[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: