9 Commits

Author SHA1 Message Date
Andy Wilkinson
2adb002275 Merge branch '1.5.x' 2016-12-02 11:21:10 +00:00
Andy Wilkinson
cee2f818d6 Fix m2e error caused by spring-boot-sample-custom-layout 2016-12-02 11:20:39 +00:00
Stephane Nicoll
655bffb8eb Merge branch '1.5.x' 2016-11-30 11:37:58 +01:00
Stephane Nicoll
740d28578b Promote plugin dependency management
This commit promotes the plugin dependency management for the
`maven-enforcer-plugin` and `maven-invoker-plugin` to the root. That way
these can be used in samples as well rather than having a separate copy.

Closes gh-7517
2016-11-30 11:37:48 +01:00
Stephane Nicoll
fcb405ebde Merge branch '1.5.x' 2016-11-29 10:04:49 +01:00
Stephane Nicoll
140379fc5a Fix Maven warnings 2016-11-29 10:03:49 +01:00
Stephane Nicoll
cb6a7b79fe Fix build failure 2016-11-29 10:03:30 +01:00
Phillip Webb
a055ef8614 Fix parent POM version following 1.5.x merge 2016-11-28 23:12:49 -08:00
Phillip Webb
8432c52369 Add custom LayoutFactory sample
Add a sample that shows how a custom LayoutFactory can be used with
both Maven and Gradle.

Closes gh-7263
2016-11-28 16:31:53 -08:00