Commit acfb7f28 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.1.x'

Closes gh-17478
parents 3c28622e 852f4a28
...@@ -37,7 +37,7 @@ configuration). ...@@ -37,7 +37,7 @@ configuration).
[[getting-started-system-requirements]] [[getting-started-system-requirements]]
== System Requirements == System Requirements
Spring Boot {spring-boot-version} requires https://www.java.com[Java 8] and is compatible 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. or above is also required.
Explicit build support is provided for the following build tools: Explicit build support is provided for the following build tools:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment