SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Workaround bug in thin launcher that brings in wrong reactor version

Browse Source
This commit is contained in:
Dave Syer
2017-01-11 10:39:43 -05:00
parent 071455b363
commit 5c79ff58a6
6 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-function-deployer/pom.xml
View File

@@ -17,6 +17,7 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud-deployer-thin.version>0.0.1.BUILD-SNAPSHOT</spring-cloud-deployer-thin.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> </properties>
<dependencies> <dependencies>

6
spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml
View File

@@ -25,6 +25,12 @@
</properties> </properties>
<dependencies> <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> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId> <artifactId>spring-cloud-function-web</artifactId>

14
spring-cloud-function-samples/spring-cloud-function-sample/pom.xml
View File

@@ -22,9 +22,16 @@
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version> <spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<wrapper.version>0.0.1.BUILD-SNAPSHOT</wrapper.version> <wrapper.version>0.0.1.BUILD-SNAPSHOT</wrapper.version>
<reactor.version>3.0.4.RELEASE</reactor.version> <reactor.version>3.0.4.RELEASE</reactor.version>
<spring-boot.version>1.5.0.BUILD-SNAPSHOT</spring-boot.version>
</properties> </properties>
<dependencies> <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> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId> <artifactId>spring-cloud-function-web</artifactId>
@@ -49,15 +56,10 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>1.5.0.BUILD-SNAPSHOT</version> <version>${spring-boot.version}</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot.experimental</groupId> <groupId>org.springframework.boot.experimental</groupId>

1
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/RestApplication.java
View File

@@ -29,3 +29,4 @@ public class RestApplication {
SpringApplication.run(RestApplication.class, args); SpringApplication.run(RestApplication.class, args);
} }
} }

6
spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java
View File

@@ -48,10 +48,10 @@ public class ReactorAutoConfiguration extends WebMvcConfigurerAdapter {
} }
@Configuration @Configuration
protected static class MessageConverters { protected static class FluxMessageConverterConfiguration {
@Bean @Bean
public HttpMessageConverters httpMessageConverters() { public FluxHttpMessageConverter fluxHttpMessageConverter() {
return new HttpMessageConverters(new FluxHttpMessageConverter()); return new FluxHttpMessageConverter();
} }
} }

3
spring-cloud-function-web/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +1,3 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.function.web.FunctionController org.springframework.cloud.function.web.FunctionController,\
org.springframework.cloud.function.web.flux.ReactorAutoConfiguration