From 2d79d63a9d553d98cefefeb3fc944341be2bce56 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 5 Sep 2017 09:48:17 +0200
Subject: [PATCH] Resume building against Spring Framework 5 snapshots

See gh-10123
Closes gh-9949
---
 .../reactor/core/ReactorCoreAutoConfiguration.java            | 2 +-
 .../boot/autoconfigure/http/HttpMessageConvertersTests.java   | 3 +++
 spring-boot-dependencies/pom.xml                              | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/core/ReactorCoreAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/core/ReactorCoreAutoConfiguration.java
index 3d32bd50459..ade1b835129 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/core/ReactorCoreAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/core/ReactorCoreAutoConfiguration.java
@@ -40,7 +40,7 @@ public class ReactorCoreAutoConfiguration {
 	@Autowired
 	protected void initialize(ReactorCoreProperties properties) {
 		if (properties.getStacktraceMode().isEnabled()) {
-			Hooks.onOperator(Hooks.OperatorHook::operatorStacktrace);
+			Hooks.onOperatorDebug();
 		}
 	}
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java
index a8a78cc199b..5c28b052824 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java
@@ -26,6 +26,7 @@ import org.junit.Test;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.ResourceHttpMessageConverter;
+import org.springframework.http.converter.ResourceRegionHttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@@ -55,6 +56,7 @@ public class HttpMessageConvertersTests {
 		}
 		assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class,
 				StringHttpMessageConverter.class, ResourceHttpMessageConverter.class,
+				ResourceRegionHttpMessageConverter.class,
 				SourceHttpMessageConverter.class,
 				AllEncompassingFormHttpMessageConverter.class,
 				MappingJackson2HttpMessageConverter.class,
@@ -128,6 +130,7 @@ public class HttpMessageConvertersTests {
 		}
 		assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class,
 				StringHttpMessageConverter.class, ResourceHttpMessageConverter.class,
+				ResourceRegionHttpMessageConverter.class,
 				SourceHttpMessageConverter.class,
 				AllEncompassingFormHttpMessageConverter.class,
 				MappingJackson2HttpMessageConverter.class,
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 225f19c6b5c..3a8ee771c66 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -142,7 +142,7 @@
 		<postgresql.version>42.1.3</postgresql.version>
 		<quartz.version>2.3.0</quartz.version>
 		<querydsl.version>4.1.4</querydsl.version>
-		<reactor-bom.version>Bismuth-M3</reactor-bom.version>
+		<reactor-bom.version>Bismuth-BUILD-SNAPSHOT</reactor-bom.version>
 		<rxjava.version>1.3.0</rxjava.version>
 		<rxjava-adapter.version>1.2.1</rxjava-adapter.version>
 		<rxjava2.version>2.1.1</rxjava2.version>
@@ -154,7 +154,7 @@
 		<slf4j.version>1.7.25</slf4j.version>
 		<snakeyaml.version>1.18</snakeyaml.version>
 		<solr.version>6.6.0</solr.version>
-		<spring.version>5.0.0.RC3</spring.version>
+		<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
 		<spring-amqp.version>2.0.0.M5</spring-amqp.version>
 		<spring-cloud-connectors.version>2.0.0.M1</spring-cloud-connectors.version>
 		<spring-batch.version>4.0.0.M3</spring-batch.version>