root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-27 18:04:38 +02:00
parent 3739699d79 2c353762ab
commit be9a0ef65d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.adoc
View File

@ -103,7 +103,7 @@ https://github.com/takari/maven-wrapper[maven wrapper]. You also need JDK 1.8.
----
If you want to build with the regular `mvn` command, you will need
https://maven.apache.org/run-maven/index.html[Maven v3.2.1 or above].
https://maven.apache.org/run-maven/index.html[Maven v3.5.0 or above].
NOTE: You may need to increase the amount of memory available to Maven by setting
a `MAVEN_OPTS` environment variable with the value `-Xmx512m`. Remember

3
spring-boot-project/spring-boot-parent/pom.xml
View File

@ -633,6 +633,9 @@
<requireJavaVersion>
<version>[1.8,)</version>
</requireJavaVersion>
<requireMavenVersion>
<version>[3.5.0,)</version>
</requireMavenVersion>
<requireProperty>
<property>main.basedir</property>
</requireProperty>