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

Merge branch '1.3.x' into 1.4.x

This commit is contained in:
Andy Wilkinson 2019-03-27 12:24:16 +00:00
parent baec3d6e8e cf2b0bc8c2
commit 8059dceee4
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.adoc
View File

@ -102,11 +102,7 @@ Boot applications can run on Java 1.6).
----
If you want to build with the regular `mvn` command, you will need
<<<<<<< HEAD
http://maven.apache.org/run-maven/index.html[Maven v3.2.1 or above].
=======
https://maven.apache.org/run-maven/index.html[Maven v3.0.5 or above].
>>>>>>> 1.3.x
https://maven.apache.org/run-maven/index.html[Maven v3.2.1 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

8
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -612,10 +612,10 @@ For example, the following YAML document:
----
environments:
dev:
url: http://dev.example.com
url: https://dev.example.com
name: Developer Setup
prod:
url: http://another.example.com
url: https://another.example.com
name: My Cool App
----
@ -623,9 +623,9 @@ Would be transformed into these properties:
[source,properties,indent=0]
----
environments.dev.url=http://dev.example.com
environments.dev.url=https://dev.example.com
environments.dev.name=Developer Setup
environments.prod.url=http://another.example.com
environments.prod.url=https://another.example.com
environments.prod.name=My Cool App
----