From 1ea8a3b1f39b2f5017faa5150d84d3f3c23bfa25 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 7 Apr 2017 08:49:07 -0400 Subject: [PATCH] Fix compatibility with SF-4.2.9 https://build.spring.io/browse/INT-AT42SIO-473 --- build.gradle | 2 +- .../aggregator/integration/AggregatorIntegrationTests.java | 4 ++-- .../integration/transformer/ContentEnricherTests.java | 4 ++-- .../config/jsr223/Jsr223InboundChannelAdapterTests.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 364dc4d55d..1de5197dc5 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java index b27d3d0154..a41e48f24f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java @@ -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); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java index db38fe24fc..510192d00c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java @@ -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()); } diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java index ae4ee2a24b..bd7bc989fc 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java @@ -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); }