Skip to content

S
spring-boot
Commit 12907e6b authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '1.0.x' 

Conflicts:
	spring-boot-starters/spring-boot-starter-parent/pom.xml
parents 94dd510b 33499e3d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
spring-boot-starters/spring-boot-starter-parent/pom.xml
View file @ 12907e6b
...@@ -51,6 +51,11 @@ ...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment