Merge branch '1.5.x'

2016-12-21 22:32:43 -08:00
parent ae389d27a6 78ee8637bc
commit 6e02fe59f7
33 changed files with 540 additions and 130 deletions
--- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt
@@ -47,7 +47,7 @@
  </build>
  ...
 </project>
-+---
+---

  The layout factory is provided as an implementation of <<<LayoutFactory>>> (from
  spring-boot-loader-tools) explicitly specified in the pom. If there is only one custom