From 90e7491d79261065ddd122cc95eb426cbb919f34 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 31 Mar 2015 15:21:35 +0100 Subject: [PATCH] Upgrade to Spring Web Services 2.2.1.RELEASE This commit updates the version of Spring Web Services to 2.2.1.RELEASE. The fix for SWS-892 means that in the event of an interceptor failing to handle a request, the request is no longer sent. The interceptor in UriVariableTests has been updated to return true, indicating that the request has been handled and should be sent. Conflicts: build.gradle spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java --- build.gradle | 2 +- .../integration/ws/config/UriVariableTests.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index cc9683e592..443fd3f622 100644 --- a/build.gradle +++ b/build.gradle @@ -130,7 +130,7 @@ subprojects { subproject -> springSocialTwitterVersion = '1.1.0.RELEASE' springRetryVersion = '1.1.2.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.0.BUILD-SNAPSHOT' - springWsVersion = '2.2.0.RELEASE' + springWsVersion = '2.2.1.RELEASE' xmlUnitVersion = '1.5' xstreamVersion = '1.4.7' } diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java index 9b663ed1c0..ecbbb8f810 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -70,6 +70,7 @@ import org.springframework.ws.transport.mail.MailSenderConnection; /** * @author Mark Fisher * @author Artem Bilan + * @author Andy Wilkinson * @since 2.1 */ @RunWith(SpringJUnit4ClassRunner.class) @@ -249,7 +250,7 @@ public class UriVariableTests { else { throw new IllegalStateException("expected WebServiceConnection in the TransportContext"); } - return false; + return true; } public boolean handleResponse(MessageContext messageContext) throws WebServiceClientException {