diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml
index 07bbc0b4..c00aa33f 100644
--- a/basic/barrier/pom.xml
+++ b/basic/barrier/pom.xml
@@ -91,6 +91,11 @@
       <version>4.2.0.RELEASE</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-amqp</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
diff --git a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java
index a74a4985..ea3a75af 100644
--- a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java
+++ b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java
@@ -16,24 +16,30 @@
 
 package org.springframework.integration.samples.barrier;
 
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 
 /**
  * @author Gary Russell
  * @since 4.2
  */
-@Configuration
-@EnableAutoConfiguration
+@SpringBootApplication
 @ImportResource("/META-INF/spring/integration/server-context.xml")
 public class Application {
 
 	public static void main(String[] args) throws Exception {
 		ConfigurableApplicationContext server = SpringApplication.run(Application.class, args);
+
+		// https://github.com/spring-projects/spring-boot/issues/3945
+		CachingConnectionFactory connectionFactory = server.getBean(CachingConnectionFactory.class);
+		connectionFactory.setPublisherConfirms(true);
+		connectionFactory.resetConnection();
+		// https://github.com/spring-projects/spring-boot/issues/3945
+
 		ConfigurableApplicationContext client
 			= new SpringApplicationBuilder("/META-INF/spring/integration/client-context.xml")
 				.web(false)
diff --git a/basic/barrier/src/main/resources/META-INF/spring/integration/client-context.xml b/basic/barrier/src/main/resources/META-INF/spring/integration/client-context.xml
index 679e3df4..6f5945fe 100644
--- a/basic/barrier/src/main/resources/META-INF/spring/integration/client-context.xml
+++ b/basic/barrier/src/main/resources/META-INF/spring/integration/client-context.xml
@@ -14,8 +14,14 @@
 	<int:channel id="requestChannel"/>
 
 	<int-http:outbound-gateway request-channel="requestChannel" 
-					url="http://localhost:8080/receiveGateway"
+					url="#{url}"
 					http-method="POST"
 					expected-response-type="java.lang.String"/>
 
+	<beans profile="default">
+		<bean id="url" class="java.lang.String">
+			<constructor-arg value="http://localhost:8080/postGateway" />
+		</bean>
+	</beans>
+
 </beans>
diff --git a/basic/barrier/src/main/resources/META-INF/spring/integration/server-context.xml b/basic/barrier/src/main/resources/META-INF/spring/integration/server-context.xml
index b6403b7d..62663b84 100644
--- a/basic/barrier/src/main/resources/META-INF/spring/integration/server-context.xml
+++ b/basic/barrier/src/main/resources/META-INF/spring/integration/server-context.xml
@@ -13,10 +13,17 @@
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<int-http:inbound-gateway request-channel="receiveChannel"
-							path="/receiveGateway"
+							path="/postGateway"
 							error-channel="errorChannel"
 							supported-methods="POST"/>
 
+	<int-http:inbound-gateway request-channel="createPayload"
+							path="/getGateway"
+							error-channel="errorChannel"
+							supported-methods="GET"/>
+
+	<int:transformer input-channel="createPayload" output-channel="receiveChannel" expression="'A,B,C'" />
+
 	<int:channel id="receiveChannel" />
 
 	<int:header-enricher input-channel="receiveChannel" output-channel="processChannel">
@@ -28,7 +35,7 @@
 	<int:chain input-channel="processChannel" order="1">
 		<int:header-filter header-names="content-type, content-length" />
 		<int:splitter delimiters="," />
-		<int-amqp:outbound-channel-adapter amqp-template="amqpTemplate"
+		<int-amqp:outbound-channel-adapter amqp-template="rabbitTemplate"
 			exchange-name="barrier.sample.exchange" routing-key="barrier.sample.key"
 			confirm-ack-channel="confirmations"
 			confirm-nack-channel="confirmations"
@@ -62,17 +69,10 @@
 
 	<int-amqp:inbound-channel-adapter channel="nullChannel"
 		queue-names="barrier.sample.queue"
-		connection-factory="connectionFactory" />
+		connection-factory="rabbitConnectionFactory" />
 	
 	<!-- Infrastructure -->
 
-	<rabbit:connection-factory id="connectionFactory" host="localhost" publisher-confirms="true"
-			publisher-returns="true"/>
-
-	<rabbit:template id="amqpTemplate" connection-factory="connectionFactory" mandatory="true" />
-
-	<rabbit:admin connection-factory="connectionFactory" />
-
 	<rabbit:queue name="barrier.sample.queue" auto-delete="true" />
 
 	<rabbit:direct-exchange name="barrier.sample.exchange" auto-delete="true">
diff --git a/basic/barrier/src/main/resources/logback.xml b/basic/barrier/src/main/resources/logback.xml
index 070671ef..f8caae18 100644
--- a/basic/barrier/src/main/resources/logback.xml
+++ b/basic/barrier/src/main/resources/logback.xml
@@ -11,4 +11,9 @@
   <root level="warn">
     <appender-ref ref="STDOUT" />
   </root>
+
+  <logger name="org.springframework" level="WARN" />
+  <logger name="org.springframework.integration" level="WARN" />
+  <logger name="org.springframework.amqp" level="WARN" />
+
 </configuration>
diff --git a/build.gradle b/build.gradle
index 303e79db..10d84aa0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -446,6 +446,7 @@ project('barrier') {
 	dependencies {
 		compile 'org.springframework.boot:spring-boot-starter-web'
 		compile 'org.springframework.boot:spring-boot-starter-integration'
+		compile 'org.springframework.boot:spring-boot-starter-amqp'
 		compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion"
 		compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion"
 		compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion"