From 8274d48cad912c49367f245a67981b4628f07eed Mon Sep 17 00:00:00 2001
From: Marius Bogoevici <mbogoevici@pivotal.io>
Date: Wed, 11 May 2016 16:23:18 -0400
Subject: [PATCH] Upgrade to Spring Boot 1.4.0.BUILD-SNAPSHOT

---
 pom.xml                                             |  3 ++-
 .../stream/binder/rabbit/RabbitBinderTests.java     | 13 +++++--------
 spring-cloud-stream-dependencies/pom.xml            |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 83e4d4226..04d3d0253 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.1.1.RELEASE</version>
+		<version>1.1.2.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -19,6 +19,7 @@
 	</scm>
 	<properties>
 		<java.version>1.7</java.version>
+		<spring-boot.version>1.4.0.BUILD-SNAPSHOT</spring-boot.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java
index 9062f2504..3dc078f53 100644
--- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java
+++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java
@@ -29,7 +29,6 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -199,7 +198,7 @@ public class RabbitBinderTests extends PartitionCapableBinderTests<RabbitTestBin
 				MessageDeliveryMode.class);
 		assertEquals(MessageDeliveryMode.PERSISTENT, mode);
 		List<?> requestHeaders = TestUtils.getPropertyValue(endpoint,
-				"handler.delegate.headerMapper.requestHeaderMatcher.strategies", List.class);
+				"handler.delegate.headerMapper.requestHeaderMatcher.matchers", List.class);
 		assertEquals(2, requestHeaders.size());
 		producerBinding.unbind();
 		assertFalse(endpoint.isRunning());
@@ -753,22 +752,20 @@ public class RabbitBinderTests extends PartitionCapableBinderTests<RabbitTestBin
 		assertEquals(5.0, TestUtils.getPropertyValue(retry, "retryOperations.backOffPolicy.multiplier"));
 
 		List<?> requestMatchers = TestUtils.getPropertyValue(endpoint,
-				"headerMapper.requestHeaderMatcher.strategies",
+				"headerMapper.requestHeaderMatcher.matchers",
 				List.class);
 		assertEquals(1, requestMatchers.size());
-		assertEquals("foo",
-				TestUtils.getPropertyValue(requestMatchers.get(0), "patterns", Collection.class).iterator().next());
+		assertEquals("foo", TestUtils.getPropertyValue(requestMatchers.get(0), "pattern"));
 
 		return container;
 	}
 
 	private void verifyFooRequestProducer(AbstractEndpoint endpoint) {
 		List<?> requestMatchers = TestUtils.getPropertyValue(endpoint,
-				"handler.delegate.headerMapper.requestHeaderMatcher.strategies",
+				"handler.delegate.headerMapper.requestHeaderMatcher.matchers",
 				List.class);
 		assertEquals(1, requestMatchers.size());
-		assertEquals("foo",
-				TestUtils.getPropertyValue(requestMatchers.get(0), "patterns", Collection.class).iterator().next());
+		assertEquals("foo", TestUtils.getPropertyValue(requestMatchers.get(0), "pattern"));
 	}
 
 	@Override
diff --git a/spring-cloud-stream-dependencies/pom.xml b/spring-cloud-stream-dependencies/pom.xml
index f92eb06dd..402ced87b 100644
--- a/spring-cloud-stream-dependencies/pom.xml
+++ b/spring-cloud-stream-dependencies/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.1.1.RELEASE</version>
+		<version>1.1.2.BUILD-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 	<artifactId>spring-cloud-stream-dependencies</artifactId>