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

Fix HTTP For Latest Spring Framework

Browse Source 
https://build.spring.io/browse/INT-FATS5IC-277/

Fix mock for request.getRawStatusCode()

4cbef27f90

Also excluded transitive SF dependencies from spring-security.
This commit is contained in:
Gary Russell
2017-09-25 10:35:08 -04:00
parent a65de25572
commit bea5706e67
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle
View File

@@ -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"
}
}

2
spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java
View File

@@ -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]));