root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade RxNetty to 0.5.2-SNAPSHOT and Tomcat to 8.0.33

This commit is contained in:
Sebastien Deleuze 2016-04-07 16:04:39 +02:00
parent 04fae44163
commit 24a63f1d90
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web-reactive/build.gradle
View File

@ -30,7 +30,7 @@ ext {
springVersion = '4.2.3.RELEASE' springVersion = '4.2.3.RELEASE'
reactorVersion = '2.5.0.BUILD-SNAPSHOT' reactorVersion = '2.5.0.BUILD-SNAPSHOT'
reactorNettyVersion = '2.5.0.BUILD-SNAPSHOT' reactorNettyVersion = '2.5.0.BUILD-SNAPSHOT'
tomcatVersion = '8.0.28' tomcatVersion = '8.0.33'
jettyVersion = '9.3.5.v20151012' jettyVersion = '9.3.5.v20151012'
nettyVersion = '4.1.0.CR3' nettyVersion = '4.1.0.CR3'
@ -96,7 +96,7 @@ dependencies {
optional "org.springframework:spring-context-support:${springVersion}" // for FreeMarker optional "org.springframework:spring-context-support:${springVersion}" // for FreeMarker
optional 'io.reactivex:rxjava:1.1.0' optional 'io.reactivex:rxjava:1.1.0'
optional "io.reactivex:rxnetty-http:0.5.0-SNAPSHOT" optional "io.reactivex:rxnetty-http:0.5.2-SNAPSHOT"
optional "com.fasterxml.jackson.core:jackson-databind:2.6.2" optional "com.fasterxml.jackson.core:jackson-databind:2.6.2"
optional "io.projectreactor:reactor-netty:${reactorNettyVersion}" optional "io.projectreactor:reactor-netty:${reactorNettyVersion}"
optional "org.apache.tomcat:tomcat-util:${tomcatVersion}" optional "org.apache.tomcat:tomcat-util:${tomcatVersion}"

2
spring-web-reactive/src/main/java/org/springframework/http/client/reactive/RxNettyClientHttpResponse.java
View File

@ -56,7 +56,7 @@ public class RxNettyClientHttpResponse implements ClientHttpResponse {
this.allocator = allocator; this.allocator = allocator;
this.response = response; this.response = response;
this.headers = new HttpHeaders(); this.headers = new HttpHeaders();
this.response.headerIterator().forEachRemaining(e -> this.headers.set(e.getKey(), e.getValue())); this.response.headerIterator().forEachRemaining(e -> this.headers.set(e.getKey().toString(), e.getValue().toString()));
this.cookies = initCookies(response); this.cookies = initCookies(response);
} }