diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml
index e5e25c304..38f324251 100644
--- a/spring-cloud-function-deployer/pom.xml
+++ b/spring-cloud-function-deployer/pom.xml
@@ -15,7 +15,7 @@
 	</parent>
 
 	<properties>
-		<spring-cloud-deployer-thin.version>1.0.9.RELEASE</spring-cloud-deployer-thin.version>
+		<spring-cloud-deployer-thin.version>1.0.10.BUILD-SNAPSHOT</spring-cloud-deployer-thin.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml
index 5479dcb5b..45477720c 100644
--- a/spring-cloud-function-samples/function-sample-pojo/pom.xml
+++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath/>
 	</parent>
 
diff --git a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties
index d3e0ea5ce..78f98ce95 100644
--- a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties
+++ b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties
@@ -1,3 +1,3 @@
-boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Edgware.RELEASE
+boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Finchley.M8
 dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream
 dependencies.spring-cloud-stream-rabbit: org.springframework.cloud:spring-cloud-starter-stream-rabbit
\ No newline at end of file
diff --git a/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java b/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java
index bd31a00de..4b662742c 100644
--- a/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java
+++ b/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java
@@ -18,10 +18,10 @@ package com.example;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.springframework.boot.context.embedded.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -46,12 +46,19 @@ public class SampleApplicationTests {
 
 	@Test
 	public void uppercase() {
-		// TODO: make this work with a JSON stream as well (like in WebFlux)
 		assertThat(new TestRestTemplate().postForObject(
 				"http://localhost:" + port + "/uppercase", "[{\"value\":\"foo\"}]",
 				String.class)).isEqualTo("[{\"value\":\"FOO\"}]");
 	}
 
+	@Test
+	public void single() {
+		// TODO: make this return a single value
+		assertThat(new TestRestTemplate().postForObject(
+				"http://localhost:" + port + "/uppercase", "{\"value\":\"foo\"}",
+				String.class)).isEqualTo("[{\"value\":\"FOO\"}]");
+	}
+
 	@Test
 	public void lowercase() {
 		assertThat(new TestRestTemplate().postForObject(