diff --git a/spring-mvc-webflow/pom.xml b/spring-mvc-webflow/pom.xml
index f0a991912a..ec6ccc8ede 100644
--- a/spring-mvc-webflow/pom.xml
+++ b/spring-mvc-webflow/pom.xml
@@ -83,10 +83,10 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
+        <org.springframework.version>5.0.1.RELEASE</org.springframework.version>
 
         <!-- Spring Web Flow -->
-        <spring.webflow>2.4.4.RELEASE</spring.webflow>
+        <spring.webflow>2.5.0.RELEASE</spring.webflow>
 
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <jstl.version>1.2</jstl.version>
@@ -94,8 +94,6 @@
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>
 
-        <rest-assured.version>2.9.0</rest-assured.version>
-
         <!-- Maven plugins -->
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
diff --git a/spring-mvc-webflow/src/main/java/org/baeldung/spring/WebMvcConfig.java b/spring-mvc-webflow/src/main/java/org/baeldung/spring/WebMvcConfig.java
index 434f49615b..46bf322f1d 100644
--- a/spring-mvc-webflow/src/main/java/org/baeldung/spring/WebMvcConfig.java
+++ b/spring-mvc-webflow/src/main/java/org/baeldung/spring/WebMvcConfig.java
@@ -2,12 +2,10 @@ package org.baeldung.spring;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.servlet.view.JstlView;
 import org.springframework.webflow.mvc.servlet.FlowHandlerAdapter;
@@ -15,7 +13,7 @@ import org.springframework.webflow.mvc.servlet.FlowHandlerMapping;
 
 @EnableWebMvc
 @Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {
 
     @Autowired
     private WebFlowConfig webFlowConfig;
diff --git a/spring-mvc-webflow/src/main/webapp/WEB-INF/flows/activation-flow.xml b/spring-mvc-webflow/src/main/webapp/WEB-INF/flows/activation-flow.xml
index ab9eb1a9b7..bad5c5f78c 100644
--- a/spring-mvc-webflow/src/main/webapp/WEB-INF/flows/activation-flow.xml
+++ b/spring-mvc-webflow/src/main/webapp/WEB-INF/flows/activation-flow.xml
@@ -2,7 +2,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+                          http://www.springframework.org/schema/webflow/spring-webflow.xsd">
 
 
     <view-state id="activation">