From 4bb99e80d005e53e2af494bbc7aa0feec9e32583 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Sun, 15 Sep 2013 12:37:07 -0700
Subject: [PATCH] Upgrade to reactor M3

---
 .../autoconfigure/reactor/ReactorAutoConfiguration.java   | 8 +++++++-
 spring-boot-dependencies/pom.xml                          | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
index 569c24ed84..57448776e2 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
@@ -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 {
+
+	}
+
 }
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 5ca43d6dd1..eff1bf0e0f 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -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>