root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to reactor M3

This commit is contained in:
Dave Syer 2013-09-15 12:37:07 -07:00
parent ef79d63544
commit 4bb99e80d0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
View File

@ -37,7 +37,6 @@ import reactor.spring.context.config.EnableReactor;
@ConditionalOnClass(EnableReactor.class)
@ConditionalOnMissingBean(Reactor.class)
@AutoConfigureAfter(WebMvcAutoConfiguration.class)
@EnableReactor
public class ReactorAutoConfiguration {
@Bean
@ -45,4 +44,11 @@ public class ReactorAutoConfiguration {
return environment.getRootReactor();
}
@Configuration
@ConditionalOnMissingBean(Environment.class)
@EnableReactor
protected static class ReactorConfiguration {
}
}

2
spring-boot-dependencies/pom.xml
View File

@ -27,7 +27,7 @@
<log4j.version>1.2.17</log4j.version>
<logback.version>1.0.13</logback.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>
<slf4j.version>1.7.5</slf4j.version>
<snakeyaml.version>1.12</snakeyaml.version>