Merge pull request #6010 from venilnoronha:issue-6003-fix

* pr/6010:
  Polish "Add activemq starter" contribution
  Add activemq starter

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>

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`:

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>

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>

spring-boot-starters/spring-boot-starter-activemq/pom.xml

@@ -0,0 +1,34 @@
+<?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>
+	</dependencies>
+</project>

spring-boot-starters/spring-boot-starter-activemq/src/main/resources/META-INF/spring.provides

@@ -0,0 +1 @@
+provides: activemq-broker,spring-jms