Merge remote-tracking branch '1.2.x'

This commit is contained in:
Dave Syer
2015-07-13 15:43:40 +01:00
6 changed files with 83 additions and 33 deletions

View File

@@ -19,6 +19,10 @@
<main.basedir>${basedir}/../..</main.basedir>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>