SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Boot 1.4.0.BUILD-SNAPSHOT

Browse Source
This commit is contained in:
Marius Bogoevici
2016-05-11 16:23:18 -04:00
parent 296d710969
commit 8274d48cad
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@@ -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>

13
spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderTests.java
View File

@@ -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

2
spring-cloud-stream-dependencies/pom.xml
View File

@@ -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>