Merge branch '1.0.x'

Conflicts: spring-boot-starters/spring-boot-starter-parent/pom.xml
2014-04-25 14:03:14 +01:00
parent 94dd510b52 33499e3d81
commit 12907e6b1b
1 changed files with 5 additions and 0 deletions
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -51,6 +51,11 @@
 				<artifactId>spring-boot-actuator</artifactId>
 				<version>${spring-boot.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-autoconfigure</artifactId>
+				<version>${spring-boot.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-amqp</artifactId>