diff --git a/spring-web-reactive/build.gradle b/spring-web-reactive/build.gradle
index 1ddf3098632..32571e2e98e 100644
--- a/spring-web-reactive/build.gradle
+++ b/spring-web-reactive/build.gradle
@@ -27,7 +27,7 @@ repositories {
 }
 
 ext {
-	springVersion = '4.3.0.RELEASE'
+	springVersion = '5.0.0.BUILD-SNAPSHOT'
 	reactorVersion = '2.5.0.BUILD-SNAPSHOT'
 	reactorNettyVersion = '2.5.0.BUILD-SNAPSHOT'
 	rxJavaVersion = '1.1.6'
@@ -112,7 +112,7 @@ dependencies {
 	optional "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
 	optional("org.freemarker:freemarker:2.3.23")
 	optional("com.fasterxml:aalto-xml:1.0.0")
-	optional("javax.validation:validation-api:1.0.0.GA")
+	optional("javax.validation:validation-api:1.1.0.Final")
 
 	provided "javax.servlet:javax.servlet-api:3.1.0"
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
index 9cd8586e7d0..568942bde90 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
@@ -94,7 +94,7 @@ public class ServletServerHttpRequest extends AbstractServerHttpRequest {
 				headers.setContentType(contentType);
 			}
 		}
-		if (contentType != null && contentType.getCharSet() == null) {
+		if (contentType != null && contentType.getCharset() == null) {
 			String encoding = getServletRequest().getCharacterEncoding();
 			if (StringUtils.hasLength(encoding)) {
 				Charset charset = Charset.forName(encoding);
diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
index 9b84f5082e7..7cdad1512ae 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
@@ -86,7 +86,7 @@ public class ServletServerHttpResponse extends AbstractServerHttpResponse {
 		if (this.response.getContentType() == null && contentType != null) {
 			this.response.setContentType(contentType.toString());
 		}
-		Charset charset = (contentType != null ? contentType.getCharSet() : null);
+		Charset charset = (contentType != null ? contentType.getCharset() : null);
 		if (this.response.getCharacterEncoding() == null && charset != null) {
 			this.response.setCharacterEncoding(charset.name());
 		}
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java
index 2fd3e491032..2a88c4fbe8f 100644
--- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java
@@ -154,7 +154,8 @@ public class RequestAttributeMethodArgumentResolverTests {
 			@RequestAttribute Foo foo,
 			@RequestAttribute("specialFoo") Foo namedFoo,
 			@RequestAttribute(name="foo", required = false) Foo notRequiredFoo,
-			@RequestAttribute(name="foo") Optional<Foo> optionalFoo) {
+			@RequestAttribute(name="foo") Optional<Foo> optionalFoo,
+			String notSupported) {
 	}
 
 	private static class Foo {
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java
index 008352b2781..fe3e3f1b7a5 100644
--- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java
@@ -161,7 +161,8 @@ public class SessionAttributeMethodArgumentResolverTests {
 			@SessionAttribute Foo foo,
 			@SessionAttribute("specialFoo") Foo namedFoo,
 			@SessionAttribute(name="foo", required = false) Foo notRequiredFoo,
-			@SessionAttribute(name="foo") Optional<Foo> optionalFoo) {
+			@SessionAttribute(name="foo") Optional<Foo> optionalFoo,
+			String notSupported) {
 	}
 
 	private static class Foo {