From 5c79ff58a67aef518e3627f0bd2e78e914becc66 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Wed, 11 Jan 2017 10:39:43 -0500
Subject: [PATCH] Workaround bug in thin launcher that brings in wrong reactor
 version

---
 spring-cloud-function-deployer/pom.xml             |  1 +
 .../spring-cloud-function-sample-pojo/pom.xml      |  6 ++++++
 .../spring-cloud-function-sample/pom.xml           | 14 ++++++++------
 .../cloud/function/web/RestApplication.java        |  1 +
 .../web/flux/ReactorAutoConfiguration.java         |  6 +++---
 .../src/main/resources/META-INF/spring.factories   |  3 ++-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml
index f8daf6a0e..16c6ea14d 100644
--- a/spring-cloud-function-deployer/pom.xml
+++ b/spring-cloud-function-deployer/pom.xml
@@ -17,6 +17,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<spring-cloud-deployer-thin.version>0.0.1.BUILD-SNAPSHOT</spring-cloud-deployer-thin.version>
+		<reactor.version>3.0.4.RELEASE</reactor.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml
index e33a8e2a8..c29c64741 100644
--- a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml
+++ b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml
@@ -25,6 +25,12 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<!-- TODO: this shouldn't be needed (bug in thin launcher) -->
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+			<version>${reactor.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-web</artifactId>
diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml
index 2449aadae..1d3e614df 100644
--- a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml
+++ b/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml
@@ -22,9 +22,16 @@
 		<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
 		<wrapper.version>0.0.1.BUILD-SNAPSHOT</wrapper.version>
 		<reactor.version>3.0.4.RELEASE</reactor.version>
+		<spring-boot.version>1.5.0.BUILD-SNAPSHOT</spring-boot.version>
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<!-- TODO: this shouldn't be needed (bug in thin launcher) -->
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+			<version>${reactor.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-web</artifactId>
@@ -49,15 +56,10 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.0</version>
-			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>1.5.0.BUILD-SNAPSHOT</version>
+				<version>${spring-boot.version}</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework.boot.experimental</groupId>
diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java
index aea2fd5a3..f59f2afe5 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java
@@ -29,3 +29,4 @@ public class RestApplication {
 		SpringApplication.run(RestApplication.class, args);
 	}
 }
+
diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java
index 271c52a2f..bfcdcab14 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java
@@ -48,10 +48,10 @@ public class ReactorAutoConfiguration extends WebMvcConfigurerAdapter {
 	}
 
 	@Configuration
-	protected static class MessageConverters {
+	protected static class FluxMessageConverterConfiguration {
 		@Bean
-		public HttpMessageConverters httpMessageConverters() {
-			return new HttpMessageConverters(new FluxHttpMessageConverter());
+		public FluxHttpMessageConverter fluxHttpMessageConverter() {
+			return new FluxHttpMessageConverter();
 		}
 	}
 
diff --git a/spring-cloud-function-web/src/main/resources/META-INF/spring.factories b/spring-cloud-function-web/src/main/resources/META-INF/spring.factories
index 14109c4d6..8c24235c9 100644
--- a/spring-cloud-function-web/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-function-web/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,3 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.function.web.FunctionController
\ No newline at end of file
+org.springframework.cloud.function.web.FunctionController,\
+org.springframework.cloud.function.web.flux.ReactorAutoConfiguration
\ No newline at end of file