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

Fix compatibility with SF-4.2.9

Browse Source 
https://build.spring.io/browse/INT-AT42SIO-473
This commit is contained in:
Artem Bilan
2017-04-07 08:49:07 -04:00
parent c7cdbc9cf5
commit 1ea8a3b1f3
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -138,7 +138,7 @@ subprojects { subproject ->
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '4.0.2.RELEASE'
springSocialTwitterVersion = '1.1.1.RELEASE'
springRetryVersion = '1.1.2.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.7.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.9.RELEASE'
springWsVersion = '2.2.2.RELEASE'
xmlUnitVersion = '1.5'
xstreamVersion = '1.4.7'

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 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.
@@ -243,7 +243,7 @@ public class AggregatorIntegrationTests {
ErrorMessage em = (ErrorMessage) this.errors.receive(10000);
assertNotNull(em);
assertThat(em.getPayload().getMessage(),
containsString("failed to send message to channel 'output' within timeout: 10"));
containsString("Failed to send message to channel 'output' within timeout: 10"));
}
finally {
this.output.purge(null);

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 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.
@@ -180,7 +180,7 @@ public class ContentEnricherTests {
enricher.handleMessage(requestMessage);
}
catch (MessageDeliveryException e) {
assertEquals("failed to send message to channel '" + requestChannelName
assertEquals("Failed to send message to channel '" + requestChannelName
+ "' within timeout: " + requestTimeout, e.getMessage());
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2013 the original author or authors.
* Copyright 2013-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.
@@ -59,7 +59,7 @@ public class Jsr223InboundChannelAdapterTests {
message = this.inboundChannelAdapterChannel.receive(20000);
assertNotNull(message);
message = this.inboundChannelAdapterChannel.receive(10);
message = this.inboundChannelAdapterChannel.receive(1);
assertNull(message);
}