diff --git a/.gitignore b/.gitignore
index 61b922a..2c23ba4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ _site/
 *.ipr
 *.iws
 .idea/*
+*/.idea
 .factorypath
 spring-xd-samples/*/xd
 dump.rdb
diff --git a/double/pom.xml b/double/pom.xml
index 5d22fcb..4751a86 100644
--- a/double/pom.xml
+++ b/double/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/double/src/test/java/demo/ModuleApplicationTests.java b/double/src/test/java/demo/ModuleApplicationTests.java
index 361e028..1bedf52 100644
--- a/double/src/test/java/demo/ModuleApplicationTests.java
+++ b/double/src/test/java/demo/ModuleApplicationTests.java
@@ -18,13 +18,14 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = DoubleApplication.class)
+@SpringBootTest(classes = DoubleApplication.class)
 @WebAppConfiguration
 @DirtiesContext
 public class ModuleApplicationTests {
diff --git a/multi-io/pom.xml b/multi-io/pom.xml
index 21d99d8..33ea0b3 100644
--- a/multi-io/pom.xml
+++ b/multi-io/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/multi-io/src/test/java/demo/ModuleApplicationTests.java b/multi-io/src/test/java/demo/ModuleApplicationTests.java
index 463a2ab..7995697 100644
--- a/multi-io/src/test/java/demo/ModuleApplicationTests.java
+++ b/multi-io/src/test/java/demo/ModuleApplicationTests.java
@@ -18,13 +18,14 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = MultipleIOChannelsApplication.class)
+@SpringBootTest(classes = MultipleIOChannelsApplication.class)
 @WebAppConfiguration
 @DirtiesContext
 public class ModuleApplicationTests {
diff --git a/multibinder-differentsystems/pom.xml b/multibinder-differentsystems/pom.xml
index c8fbc49..8aec847 100644
--- a/multibinder-differentsystems/pom.xml
+++ b/multibinder-differentsystems/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/multibinder-differentsystems/src/main/java/multibinder/BridgeTransformer.java b/multibinder-differentsystems/src/main/java/multibinder/BridgeTransformer.java
index d68720f..da680be 100644
--- a/multibinder-differentsystems/src/main/java/multibinder/BridgeTransformer.java
+++ b/multibinder-differentsystems/src/main/java/multibinder/BridgeTransformer.java
@@ -17,8 +17,9 @@
 package multibinder;
 
 import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.cloud.stream.annotation.StreamListener;
 import org.springframework.cloud.stream.messaging.Processor;
-import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.messaging.handler.annotation.SendTo;
 
 /**
  * @author Marius Bogoevici
@@ -26,7 +27,8 @@ import org.springframework.integration.annotation.ServiceActivator;
 @EnableBinding(Processor.class)
 public class BridgeTransformer {
 
-	@ServiceActivator(inputChannel = Processor.INPUT, outputChannel = Processor.OUTPUT)
+	@StreamListener(Processor.INPUT)
+	@SendTo(Processor.OUTPUT)
 	public Object transform(Object payload) {
 		return payload;
 	}
diff --git a/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java b/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java
index 2245619..fc34917 100644
--- a/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java
+++ b/multibinder-differentsystems/src/test/java/multibinder/TwoKafkaBindersApplicationTest.java
@@ -23,22 +23,21 @@ import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.stream.binder.Binder;
 import org.springframework.cloud.stream.binder.BinderFactory;
 import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
 import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
-import org.springframework.cloud.stream.binder.kafka.KafkaConsumerProperties;
 import org.springframework.cloud.stream.binder.kafka.KafkaMessageChannelBinder;
-import org.springframework.cloud.stream.binder.kafka.KafkaProducerProperties;
-import org.springframework.cloud.stream.binder.kafka.config.KafkaBinderConfigurationProperties;
+import org.springframework.cloud.stream.binder.kafka.properties.KafkaBinderConfigurationProperties;
+import org.springframework.cloud.stream.binder.kafka.properties.KafkaConsumerProperties;
+import org.springframework.cloud.stream.binder.kafka.properties.KafkaProducerProperties;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.kafka.test.rule.KafkaEmbedded;
@@ -107,7 +106,6 @@ public class TwoKafkaBindersApplicationTest {
 
 		String testPayload = "testFoo" + UUID.randomUUID().toString();
 		dataProducer.send(MessageBuilder.withPayload(testPayload).build());
-
 		Message<?> receive = dataConsumer.receive(60_000);
 		Assert.assertThat(receive, Matchers.notNullValue());
 		Assert.assertThat(receive.getPayload(), CoreMatchers.equalTo(testPayload));
diff --git a/multibinder/pom.xml b/multibinder/pom.xml
index f0c0afd..91f8efe 100644
--- a/multibinder/pom.xml
+++ b/multibinder/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -22,18 +22,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-sample-source</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-sample-transform</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-stream-sample-sink</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-rabbit</artifactId>
diff --git a/multibinder/src/main/java/multibinder/BridgeTransformer.java b/multibinder/src/main/java/multibinder/BridgeTransformer.java
index d68720f..0e25a55 100644
--- a/multibinder/src/main/java/multibinder/BridgeTransformer.java
+++ b/multibinder/src/main/java/multibinder/BridgeTransformer.java
@@ -17,8 +17,10 @@
 package multibinder;
 
 import org.springframework.cloud.stream.annotation.EnableBinding;
+import org.springframework.cloud.stream.annotation.StreamListener;
 import org.springframework.cloud.stream.messaging.Processor;
 import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.messaging.handler.annotation.SendTo;
 
 /**
  * @author Marius Bogoevici
@@ -26,7 +28,8 @@ import org.springframework.integration.annotation.ServiceActivator;
 @EnableBinding(Processor.class)
 public class BridgeTransformer {
 
-	@ServiceActivator(inputChannel = Processor.INPUT, outputChannel = Processor.OUTPUT)
+	@StreamListener(Processor.INPUT)
+	@SendTo(Processor.OUTPUT)
 	public Object transform(Object payload) {
 		return payload;
 	}
diff --git a/multibinder/src/test/java/multibinder/RabbitAndKafkaBinderApplicationTests.java b/multibinder/src/test/java/multibinder/RabbitAndKafkaBinderApplicationTests.java
index f45e01a..7ecfe01 100644
--- a/multibinder/src/test/java/multibinder/RabbitAndKafkaBinderApplicationTests.java
+++ b/multibinder/src/test/java/multibinder/RabbitAndKafkaBinderApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,9 +31,9 @@ import org.springframework.cloud.stream.binder.BinderFactory;
 import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
 import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
 import org.springframework.cloud.stream.binder.kafka.KafkaMessageChannelBinder;
-import org.springframework.cloud.stream.binder.kafka.KafkaProducerProperties;
-import org.springframework.cloud.stream.binder.rabbit.RabbitConsumerProperties;
+import org.springframework.cloud.stream.binder.kafka.properties.KafkaProducerProperties;
 import org.springframework.cloud.stream.binder.rabbit.RabbitMessageChannelBinder;
+import org.springframework.cloud.stream.binder.rabbit.properties.RabbitConsumerProperties;
 import org.springframework.cloud.stream.binder.test.junit.rabbit.RabbitTestSupport;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.integration.channel.DirectChannel;
diff --git a/pom.xml b/pom.xml
index 94d2cb5..67246f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-stream-samples</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.2.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<url>https://github.com/spring-cloud/spring-cloud-stream-samples</url>
 	<organization>
@@ -13,15 +13,16 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.2.0.RELEASE</version>
+		<version>1.3.1.RELEASE</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-cloud-stream.version>Brooklyn.SR3</spring-cloud-stream.version>
+		<spring-cloud-stream.version>Chelsea.RELEASE</spring-cloud-stream.version>
 		<java.version>1.8</java.version>
 	</properties>
 	<modules>
 		<module>source</module>
+		<module>dynamic-source</module>
 		<module>sink</module>
 		<module>transform</module>
 		<module>double</module>
@@ -45,17 +46,17 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-sample-source</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>1.2.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-sample-sink</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>1.2.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-stream-sample-transform</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>1.2.0.BUILD-SNAPSHOT</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/reactive-processor-kafka/pom.xml b/reactive-processor-kafka/pom.xml
index a1118f5..6c3f1ef 100644
--- a/reactive-processor-kafka/pom.xml
+++ b/reactive-processor-kafka/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-stream-samples</artifactId>
         <groupId>org.springframework.cloud</groupId>
-        <version>1.1.0.BUILD-SNAPSHOT</version>
+        <version>1.2.0.BUILD-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/rxjava-processor/pom.xml b/rxjava-processor/pom.xml
index f879c2d..432c239 100644
--- a/rxjava-processor/pom.xml
+++ b/rxjava-processor/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
@@ -43,10 +43,6 @@
 			<artifactId>rxjava</artifactId>
 			<version>1.1.10</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/rxjava-processor/src/test/java/demo/ModuleApplicationTests.java b/rxjava-processor/src/test/java/demo/ModuleApplicationTests.java
index 4e6887b..389c424 100644
--- a/rxjava-processor/src/test/java/demo/ModuleApplicationTests.java
+++ b/rxjava-processor/src/test/java/demo/ModuleApplicationTests.java
@@ -18,13 +18,14 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = RxJavaApplication.class)
+@SpringBootTest(classes = RxJavaApplication.class)
 @WebAppConfiguration
 @DirtiesContext
 public class ModuleApplicationTests {
diff --git a/sink/pom.xml b/sink/pom.xml
index 165b5ad..b867adc 100644
--- a/sink/pom.xml
+++ b/sink/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/sink/src/test/java/demo/ModuleApplicationTests.java b/sink/src/test/java/demo/ModuleApplicationTests.java
index f2a02f2..d956ee5 100644
--- a/sink/src/test/java/demo/ModuleApplicationTests.java
+++ b/sink/src/test/java/demo/ModuleApplicationTests.java
@@ -16,12 +16,11 @@
 
 package demo;
 
-import static org.junit.Assert.assertNotNull;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.stream.annotation.Bindings;
 import org.springframework.cloud.stream.annotation.Output;
 import org.springframework.cloud.stream.messaging.Sink;
@@ -31,8 +30,10 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
+import static org.junit.Assert.assertNotNull;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SinkApplication.class)
+@SpringBootTest(classes = SinkApplication.class)
 @WebAppConfiguration
 @DirtiesContext
 public class ModuleApplicationTests {
diff --git a/source/pom.xml b/source/pom.xml
index 4992a3e..7a4ab2a 100644
--- a/source/pom.xml
+++ b/source/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/source/src/test/java/demo/ModuleApplicationTests.java b/source/src/test/java/demo/ModuleApplicationTests.java
index ae245b5..35a953a 100644
--- a/source/src/test/java/demo/ModuleApplicationTests.java
+++ b/source/src/test/java/demo/ModuleApplicationTests.java
@@ -18,13 +18,14 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SourceApplication.class)
+@SpringBootTest(classes = SourceApplication.class)
 @WebAppConfiguration
 @DirtiesContext
 public class ModuleApplicationTests {
diff --git a/stream-listener/pom.xml b/stream-listener/pom.xml
index c2f7b1a..093cbb7 100644
--- a/stream-listener/pom.xml
+++ b/stream-listener/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/stream-listener/src/test/java/demo/ModuleApplicationTests.java b/stream-listener/src/test/java/demo/ModuleApplicationTests.java
index 50b3bcf..12a5631 100644
--- a/stream-listener/src/test/java/demo/ModuleApplicationTests.java
+++ b/stream-listener/src/test/java/demo/ModuleApplicationTests.java
@@ -18,13 +18,14 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = TypeConversionApplication.class)
+@SpringBootTest(classes = TypeConversionApplication.class)
 @WebAppConfiguration
 @DirtiesContext
 public class ModuleApplicationTests {
diff --git a/transform/pom.xml b/transform/pom.xml
index a136a71..825b8e9 100644
--- a/transform/pom.xml
+++ b/transform/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-samples</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/transform/src/test/java/demo/ModuleApplicationTests.java b/transform/src/test/java/demo/ModuleApplicationTests.java
index c1ee7d6..9c7cfe5 100644
--- a/transform/src/test/java/demo/ModuleApplicationTests.java
+++ b/transform/src/test/java/demo/ModuleApplicationTests.java
@@ -18,13 +18,14 @@ package demo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = TransformApplication.class)
+@SpringBootTest(classes = TransformApplication.class)
 @WebAppConfiguration
 @DirtiesContext
 public class ModuleApplicationTests {