From dcb4fe8304bb051a6db5d3832da7dd6eaa59c23c Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 13 May 2016 16:33:20 +0200
Subject: [PATCH] Add JMX support to the Spring Integration starter

Closes gh-1440
---
 .../src/main/asciidoc/spring-boot-features.adoc        | 10 ++++++----
 .../spring-boot-sample-integration/pom.xml             |  4 ----
 .../spring-boot-sample-parent-context/pom.xml          |  4 ----
 .../spring-boot-starter-integration/pom.xml            |  4 ++++
 .../src/main/resources/META-INF/spring.provides        |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

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 8198266b44b..9fde94d6aef 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -4382,10 +4382,12 @@ caching is enabled.
 
 [[boot-features-integration]]
 == Spring Integration
-Spring Integration provides abstractions over messaging and also other transports such as
-HTTP, TCP etc. If Spring Integration is available on your classpath it will be initialized
-through the `@EnableIntegration` annotation. Message processing statistics will be
-published over JMX if `'spring-integration-jmx'` is also on the classpath. See the
+Spring Boot offers several conveniences for working with Spring Integration, including
+the `spring-boot-starter-integration` '`Starter POM`'. Spring Integration provides
+abstractions over messaging and also other transports such as HTTP, TCP etc. If Spring
+Integration is available on your classpath it will be initialized through the
+`@EnableIntegration` annotation. Message processing statistics will be published over JMX
+if `'spring-integration-jmx'` is also on the classpath. See the
 {sc-spring-boot-autoconfigure}/integration/IntegrationAutoConfiguration.{sc-ext}[`IntegrationAutoConfiguration`]
 class for more details.
 
diff --git a/spring-boot-samples/spring-boot-sample-integration/pom.xml b/spring-boot-samples/spring-boot-sample-integration/pom.xml
index 37f9d1a99db..9dcb8dbcc76 100644
--- a/spring-boot-samples/spring-boot-sample-integration/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-integration/pom.xml
@@ -31,10 +31,6 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-file</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-jmx</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-boot-samples/spring-boot-sample-parent-context/pom.xml b/spring-boot-samples/spring-boot-sample-parent-context/pom.xml
index abec95ea402..87d2a4003e2 100644
--- a/spring-boot-samples/spring-boot-sample-parent-context/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-parent-context/pom.xml
@@ -32,10 +32,6 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-file</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-jmx</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/spring-boot-starters/spring-boot-starter-integration/pom.xml b/spring-boot-starters/spring-boot-starter-integration/pom.xml
index 62efa190ae3..ced67bbd9ef 100644
--- a/spring-boot-starters/spring-boot-starter-integration/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-integration/pom.xml
@@ -34,5 +34,9 @@
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-java-dsl</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-jmx</artifactId>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-boot-starters/spring-boot-starter-integration/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-integration/src/main/resources/META-INF/spring.provides
index 9533e55d99e..66fb5df913c 100644
--- a/spring-boot-starters/spring-boot-starter-integration/src/main/resources/META-INF/spring.provides
+++ b/spring-boot-starters/spring-boot-starter-integration/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: spring-integration-core,spring-integration-file,spring-integration-http,spring-integration-stream
\ No newline at end of file
+provides: spring-integration-core,spring-integration-java-dsl,spring-integration-jmx
\ No newline at end of file