From bea5706e67fc0ea665f0796bc86551a2ad948774 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 25 Sep 2017 10:35:08 -0400 Subject: [PATCH] Fix HTTP For Latest Spring Framework https://build.spring.io/browse/INT-FATS5IC-277/ Fix mock for request.getRawStatusCode() https://github.com/spring-projects/spring-framework/commit/4cbef27f90ded887af9ae9639550999aa81f3847 Also excluded transitive SF dependencies from spring-security. --- build.gradle | 24 +++++++++++++------ ...tpRequestExecutingMessageHandlerTests.java | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index e05dd6b7f7..80cb8022d8 100644 --- a/build.gradle +++ b/build.gradle @@ -137,7 +137,7 @@ subprojects { subproject -> springSecurityVersion = '5.0.0.M4' springSocialTwitterVersion = '2.0.0.M4' springRetryVersion = '1.2.1.RELEASE' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.RC4' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.BUILD-SNAPSHOT' springWsVersion = '2.4.0.RELEASE' tomcatVersion = "8.5.20" xmlUnitVersion = '1.6' @@ -401,8 +401,12 @@ project('spring-integration-http') { compile ("com.rometools:rome:$romeToolsVersion", optional) testCompile project(":spring-integration-security") - testCompile "org.springframework.security:spring-security-config:$springSecurityVersion" - testCompile "org.springframework.security:spring-security-test:$springSecurityVersion" + testCompile ("org.springframework.security:spring-security-config:$springSecurityVersion") { + exclude group: 'org.springframework' + } + testCompile ("org.springframework.security:spring-security-test:$springSecurityVersion") { + exclude group: 'org.springframework' + } } } @@ -567,10 +571,12 @@ project('spring-integration-security') { dependencies { compile project(":spring-integration-core") compile("org.springframework.security:spring-security-core:$springSecurityVersion") { - exclude group: 'org.springframework', module: 'spring-support' + exclude group: 'org.springframework' } - testCompile "org.springframework.security:spring-security-config:$springSecurityVersion" + testCompile ("org.springframework.security:spring-security-config:$springSecurityVersion") { + exclude group: 'org.springframework' + } } } @@ -656,8 +662,12 @@ project('spring-integration-webflux') { compile ("io.projectreactor.ipc:reactor-netty:$reactorNettyVersion" , optional) testCompile "org.springframework:spring-webmvc:$springVersion" - testCompile "org.springframework.security:spring-security-config:$springSecurityVersion" - testCompile "org.springframework.security:spring-security-test:$springSecurityVersion" + testCompile ("org.springframework.security:spring-security-config:$springSecurityVersion") { + exclude group: 'org.springframework' + } + testCompile ("org.springframework.security:spring-security-test:$springSecurityVersion") { + exclude group: 'org.springframework' + } testCompile "io.projectreactor:reactor-test:$reactorVersion" } } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java index bf79eebf42..abc2a60d48 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java @@ -848,7 +848,7 @@ public class HttpRequestExecutingMessageHandlerTests { when(requestFactory.createRequest(any(URI.class), any(HttpMethod.class))).thenReturn(clientRequest); ClientHttpResponse response = mock(ClientHttpResponse.class); - when(response.getStatusCode()).thenReturn(HttpStatus.NOT_FOUND); + when(response.getRawStatusCode()).thenReturn(HttpStatus.NOT_FOUND.value()); when(response.getStatusText()).thenReturn("Not Found"); when(response.getBody()).thenReturn(new ByteArrayInputStream(new byte[0]));