Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert to B-S versions for base line dependencies

Browse Source 
Increase receive timeouts in the `ResequencerTests`
This commit is contained in:
Artem Bilan
2017-05-15 10:31:08 -04:00
parent fde097f27e
commit 6c2200a03f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@@ -125,20 +125,20 @@ subprojects { subproject ->
pahoMqttClientVersion = '1.1.1'
postgresVersion = '42.0.0'
reactorNettyVersion = '0.6.3.RELEASE'
reactorVersion = '3.1.0.M1'
reactorVersion = '3.1.0.BUILD-SNAPSHOT'
romeToolsVersion = '1.7.2'
servletApiVersion = '3.1.0'
slf4jVersion = "1.7.25"
smackVersion = '4.1.9'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.M4'
springDataJpaVersion = '2.0.0.M3'
springDataMongoVersion = '2.0.0.M3'
springDataRedisVersion = '2.0.0.M3'
springGemfireVersion = '2.0.0.M3'
springSecurityVersion = '5.0.0.M1'
springSocialTwitterVersion = '2.0.0.M2'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.BUILD-SNAPSHOT'
springDataJpaVersion = '2.0.0.BUILD-SNAPSHOT'
springDataMongoVersion = '2.0.0.BUILD-SNAPSHOT'
springDataRedisVersion = '2.0.0.BUILD-SNAPSHOT'
springGemfireVersion = '2.0.0.BUILD-SNAPSHOT'
springSecurityVersion = '5.0.0.BUILD-SNAPSHOT'
springSocialTwitterVersion = '2.0.0.BUILD-SNAPSHOT'
springRetryVersion = '1.2.0.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.RC1'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.BUILD-SNAPSHOT'
springWsVersion = '2.4.0.RELEASE'
tomcatVersion = "8.5.14"
xmlUnitVersion = '1.6'

6
spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -391,7 +391,7 @@ public class ResequencerTests {
this.resequencer.handleMessage(message2);
Message<?> out1 = replyChannel.receive(0);
assertNull(out1);
out1 = discardChannel.receive(1000);
out1 = discardChannel.receive(10000);
assertNotNull(out1);
Message<?> out2 = discardChannel.receive(10);
assertNotNull(out2);
@@ -399,7 +399,7 @@ public class ResequencerTests {
this.resequencer.handleMessage(message1);
Message<?> out3 = discardChannel.receive(0);
assertNull(out3);
out3 = discardChannel.receive(1000);
out3 = discardChannel.receive(10000);
assertNotNull(out3);
}