Commit 4bb99e80 authored by Dave Syer's avatar Dave Syer

Upgrade to reactor M3

parent ef79d635
...@@ -37,7 +37,6 @@ import reactor.spring.context.config.EnableReactor; ...@@ -37,7 +37,6 @@ import reactor.spring.context.config.EnableReactor;
@ConditionalOnClass(EnableReactor.class) @ConditionalOnClass(EnableReactor.class)
@ConditionalOnMissingBean(Reactor.class) @ConditionalOnMissingBean(Reactor.class)
@AutoConfigureAfter(WebMvcAutoConfiguration.class) @AutoConfigureAfter(WebMvcAutoConfiguration.class)
@EnableReactor
public class ReactorAutoConfiguration { public class ReactorAutoConfiguration {
@Bean @Bean
...@@ -45,4 +44,11 @@ public class ReactorAutoConfiguration { ...@@ -45,4 +44,11 @@ public class ReactorAutoConfiguration {
return environment.getRootReactor(); return environment.getRootReactor();
} }
@Configuration
@ConditionalOnMissingBean(Environment.class)
@EnableReactor
protected static class ReactorConfiguration {
}
} }
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<logback.version>1.0.13</logback.version> <logback.version>1.0.13</logback.version>
<mockito.version>1.9.5</mockito.version> <mockito.version>1.9.5</mockito.version>
<reactor.version>1.0.0.M2</reactor.version> <reactor.version>1.0.0.M3</reactor.version>
<servlet-api.version>3.0.1</servlet-api.version> <servlet-api.version>3.0.1</servlet-api.version>
<slf4j.version>1.7.5</slf4j.version> <slf4j.version>1.7.5</slf4j.version>
<snakeyaml.version>1.12</snakeyaml.version> <snakeyaml.version>1.12</snakeyaml.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment