Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2017-01-05 23:39:30 -08:00
40 changed files with 1928 additions and 11 deletions

View File

@@ -37,6 +37,7 @@
<module>spring-boot-sample-data-couchbase</module>
<module>spring-boot-sample-data-elasticsearch</module>
<module>spring-boot-sample-data-jpa</module>
<module>spring-boot-sample-data-ldap</module>
<module>spring-boot-sample-data-mongodb</module>
<module>spring-boot-sample-data-neo4j</module>
<module>spring-boot-sample-data-redis</module>
@@ -112,6 +113,7 @@
<module>spring-boot-sample-websocket-undertow</module>
<module>spring-boot-sample-webservices</module>
<module>spring-boot-sample-xml</module>
<module>spring-boot-sample-hypermedia-ui-secure</module>
</modules>
<!-- No dependencies - otherwise the samples won't work if you change the
parent -->