From f257b6a0b57b429508c0eee490dd5487ee4a7651 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 26 May 2016 11:40:24 +0200
Subject: [PATCH] Polish "Add activemq starter" contribution

Closes gh-6010
---
 spring-boot-dependencies/pom.xml                       |  5 +++++
 .../src/main/asciidoc/spring-boot-features.adoc        |  4 ++++
 .../spring-boot-sample-activemq/pom.xml                | 10 +---------
 .../spring-boot-starter-activemq/pom.xml               |  4 ----
 .../src/main/resources/META-INF/spring.provides        |  2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index a1012ec96b..77784031fb 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -264,6 +264,11 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-activemq</artifactId>
+				<version>1.4.0.BUILD-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-actuator</artifactId>
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index cb421abc24..05696d83b7 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -3859,6 +3859,10 @@ Spring Boot can also configure a `ConnectionFactory` when it detects that Active
 available on the classpath. If the broker is present, an embedded broker is started and
 configured automatically (as long as no broker URL is specified through configuration).
 
+NOTE: If you are using `spring-boot-starter-activemq` the necessary dependencies to
+connect or embed an ActiveMQ instance are provided, as well as the Spring infrastructure
+to integrate with JMS.
+
 ActiveMQ configuration is controlled by external configuration properties in
 `+spring.activemq.*+`. For example, you might declare the following section in
 `application.properties`:
diff --git a/spring-boot-samples/spring-boot-sample-activemq/pom.xml b/spring-boot-samples/spring-boot-sample-activemq/pom.xml
index 55e2374bcb..4353569420 100644
--- a/spring-boot-samples/spring-boot-sample-activemq/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-activemq/pom.xml
@@ -21,15 +21,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jms</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-broker</artifactId>
+			<artifactId>spring-boot-starter-activemq</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-starters/spring-boot-starter-activemq/pom.xml b/spring-boot-starters/spring-boot-starter-activemq/pom.xml
index c283830311..36507263d0 100644
--- a/spring-boot-starters/spring-boot-starter-activemq/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-activemq/pom.xml
@@ -30,9 +30,5 @@
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-broker</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-pool</artifactId>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-boot-starters/spring-boot-starter-activemq/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-activemq/src/main/resources/META-INF/spring.provides
index becec732bd..c49ebaabda 100644
--- a/spring-boot-starters/spring-boot-starter-activemq/src/main/resources/META-INF/spring.provides
+++ b/spring-boot-starters/spring-boot-starter-activemq/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: activemq-broker,activemq-pool,spring-jms
+provides: activemq-broker,spring-jms