root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.0.x' 

Conflicts:
	spring-boot-starters/spring-boot-starter-parent/pom.xml
This commit is contained in:
Phillip Webb 2014-04-25 14:03:14 +01:00
parent 94dd510b52 33499e3d81
commit 12907e6b1b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-starters/spring-boot-starter-parent/pom.xml
View File

@ -51,6 +51,11 @@
<artifactId>spring-boot-actuator</artifactId> <artifactId>spring-boot-actuator</artifactId>
<version>${spring-boot.version}</version> <version>${spring-boot.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId> <artifactId>spring-boot-starter-amqp</artifactId>