Skip to content

Commit 1ea8a3b

Browse files
committed
Fix compatibility with SF-4.2.9
https://build.spring.io/browse/INT-AT42SIO-473
1 parent c7cdbc9 commit 1ea8a3b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ subprojects { subproject ->
138138
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '4.0.2.RELEASE'
139139
springSocialTwitterVersion = '1.1.1.RELEASE'
140140
springRetryVersion = '1.1.2.RELEASE'
141-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.7.RELEASE'
141+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.9.RELEASE'
142142
springWsVersion = '2.2.2.RELEASE'
143143
xmlUnitVersion = '1.5'
144144
xstreamVersion = '1.4.7'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 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.
@@ -243,7 +243,7 @@ public void testZeroGroupTimeoutExpressionScheduling() throws Exception {
243243
ErrorMessage em = (ErrorMessage) this.errors.receive(10000);
244244
assertNotNull(em);
245245
assertThat(em.getPayload().getMessage(),
246-
containsString("failed to send message to channel 'output' within timeout: 10"));
246+
containsString("Failed to send message to channel 'output' within timeout: 10"));
247247
}
248248
finally {
249249
this.output.purge(null);

spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 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.
@@ -180,7 +180,7 @@ public void requestChannelSendTimingOut() {
180180
enricher.handleMessage(requestMessage);
181181
}
182182
catch (MessageDeliveryException e) {
183-
assertEquals("failed to send message to channel '" + requestChannelName
183+
assertEquals("Failed to send message to channel '" + requestChannelName
184184
+ "' within timeout: " + requestTimeout, e.getMessage());
185185
}
186186

spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013 the original author or authors.
2+
* Copyright 2013-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.
@@ -59,7 +59,7 @@ public void testInt2867InboundChannelAdapter() throws Exception {
5959
message = this.inboundChannelAdapterChannel.receive(20000);
6060
assertNotNull(message);
6161

62-
message = this.inboundChannelAdapterChannel.receive(10);
62+
message = this.inboundChannelAdapterChannel.receive(1);
6363
assertNull(message);
6464
}
6565

0 commit comments

Comments
 (0)