Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2016-11-28 15:37:43 -08:00
14 changed files with 39 additions and 34 deletions

View File

@@ -18,11 +18,11 @@
<main.basedir>${basedir}/..</main.basedir>
</properties>
<dependencies>
<!-- Compile -->
<dependency>
<groupId>org.springframework.hateoas</groupId>
<artifactId>spring-hateoas</artifactId>
</dependency>
<!-- Provided -->
<dependency>
<groupId>org.springframework.boot</groupId>