From a5066f4d7a9651c42fcf09f0957916b5d9caee4e Mon Sep 17 00:00:00 2001
From: Venil Noronha <venil.noronha@gmail.com>
Date: Sat, 21 May 2016 23:43:32 +0530
Subject: [PATCH 1/2] Add activemq starter

Closes gh-6003
---
 spring-boot-starters/pom.xml                  |  1 +
 .../spring-boot-starter-activemq/pom.xml      | 38 +++++++++++++++++++
 .../main/resources/META-INF/spring.provides   |  1 +
 3 files changed, 40 insertions(+)
 create mode 100644 spring-boot-starters/spring-boot-starter-activemq/pom.xml
 create mode 100644 spring-boot-starters/spring-boot-starter-activemq/src/main/resources/META-INF/spring.provides

diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index ebafef6c887..afbe766a169 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -21,6 +21,7 @@
 	</properties>
 	<modules>
 		<module>spring-boot-starter</module>
+		<module>spring-boot-starter-activemq</module>
 		<module>spring-boot-starter-amqp</module>
 		<module>spring-boot-starter-aop</module>
 		<module>spring-boot-starter-artemis</module>
diff --git a/spring-boot-starters/spring-boot-starter-activemq/pom.xml b/spring-boot-starters/spring-boot-starter-activemq/pom.xml
new file mode 100644
index 00000000000..c2838303112
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-activemq/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starters</artifactId>
+		<version>1.4.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-starter-activemq</artifactId>
+	<name>Spring Boot ActiveMQ Starter</name>
+	<description>Starter for JMS messaging using Apache ActiveMQ</description>
+	<url>http://projects.spring.io/spring-boot/</url>
+	<organization>
+		<name>Pivotal Software, Inc.</name>
+		<url>http://www.spring.io</url>
+	</organization>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<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>
+		</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
new file mode 100644
index 00000000000..becec732bd0
--- /dev/null
+++ b/spring-boot-starters/spring-boot-starter-activemq/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: activemq-broker,activemq-pool,spring-jms

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 2/2] 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 a1012ec96b2..77784031fb3 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 cb421abc240..05696d83b7e 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 55e2374bcb7..43535694209 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 c2838303112..36507263d0e 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 becec732bd0..c49ebaabdae 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