Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2016-03-15 12:16:56 +01:00
parent 34852f772b 3c15ddf807
commit a5a8c567cf
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-docs/pom.xml
View File

@@ -744,6 +744,7 @@
<doctype>book</doctype>
<attributes>
<docinfo>true</docinfo>
<spring-version>${spring.version}</spring-version>
<spring-boot-version>${project.version}</spring-boot-version>
<spring-boot-docs-version>${project.version}</spring-boot-docs-version>
<spring-boot-repo>${spring-boot-repo}</spring-boot-repo>

2
spring-boot-docs/src/main/asciidoc/getting-started.adoc
View File

@@ -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.5 or above. You can use Spring Boot with Java 6 with some additional
Spring Framework {spring-version} 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+).