Skip to content

Commit 6c2200a

Browse files
committed
Revert to B-S versions for base line dependencies
Increase receive timeouts in the `ResequencerTests`
1 parent fde097f commit 6c2200a

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,20 @@ subprojects { subproject ->
125125
pahoMqttClientVersion = '1.1.1'
126126
postgresVersion = '42.0.0'
127127
reactorNettyVersion = '0.6.3.RELEASE'
128-
reactorVersion = '3.1.0.M1'
128+
reactorVersion = '3.1.0.BUILD-SNAPSHOT'
129129
romeToolsVersion = '1.7.2'
130130
servletApiVersion = '3.1.0'
131131
slf4jVersion = "1.7.25"
132132
smackVersion = '4.1.9'
133-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.M4'
134-
springDataJpaVersion = '2.0.0.M3'
135-
springDataMongoVersion = '2.0.0.M3'
136-
springDataRedisVersion = '2.0.0.M3'
137-
springGemfireVersion = '2.0.0.M3'
138-
springSecurityVersion = '5.0.0.M1'
139-
springSocialTwitterVersion = '2.0.0.M2'
133+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.BUILD-SNAPSHOT'
134+
springDataJpaVersion = '2.0.0.BUILD-SNAPSHOT'
135+
springDataMongoVersion = '2.0.0.BUILD-SNAPSHOT'
136+
springDataRedisVersion = '2.0.0.BUILD-SNAPSHOT'
137+
springGemfireVersion = '2.0.0.BUILD-SNAPSHOT'
138+
springSecurityVersion = '5.0.0.BUILD-SNAPSHOT'
139+
springSocialTwitterVersion = '2.0.0.BUILD-SNAPSHOT'
140140
springRetryVersion = '1.2.0.RELEASE'
141-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.RC1'
141+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.BUILD-SNAPSHOT'
142142
springWsVersion = '2.4.0.RELEASE'
143143
tomcatVersion = "8.5.14"
144144
xmlUnitVersion = '1.6'

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -391,15 +391,15 @@ public void testTimeoutDontExpire() throws InterruptedException {
391391
this.resequencer.handleMessage(message2);
392392
Message<?> out1 = replyChannel.receive(0);
393393
assertNull(out1);
394-
out1 = discardChannel.receive(1000);
394+
out1 = discardChannel.receive(10000);
395395
assertNotNull(out1);
396396
Message<?> out2 = discardChannel.receive(10);
397397
assertNotNull(out2);
398398
Message<?> message1 = createMessage("123", "ABC", 3, 1, null);
399399
this.resequencer.handleMessage(message1);
400400
Message<?> out3 = discardChannel.receive(0);
401401
assertNull(out3);
402-
out3 = discardChannel.receive(1000);
402+
out3 = discardChannel.receive(10000);
403403
assertNotNull(out3);
404404
}
405405

0 commit comments

Comments
 (0)