diff --git a/spring-remoting/pom.xml b/spring-remoting/pom.xml
index 6fa2846130..060f33837c 100644
--- a/spring-remoting/pom.xml
+++ b/spring-remoting/pom.xml
@@ -7,7 +7,8 @@
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
     <name>spring-remoting</name>
-    <description>Parent for all projects related to Spring Remoting.</description>
+    <description>Parent for all projects related to Spring Remoting, except remoting-hessian-burlap</description>
+    <!-- remoting-hessian-burlap needs to stick to spring-boot-1, some classes were removed in spring 5  -->
 
     <parent>
         <artifactId>parent-boot-2</artifactId>
@@ -28,8 +29,8 @@
     </dependencyManagement>
 
     <modules>
-        <module>remoting-http</module>
         <module>remoting-hessian-burlap</module>
+        <module>remoting-http</module>
         <module>remoting-amqp</module>
         <module>remoting-jms</module>
         <module>remoting-rmi</module>
diff --git a/spring-remoting/remoting-hessian-burlap/pom.xml b/spring-remoting/remoting-hessian-burlap/pom.xml
index e63d0ee22e..8c30e76296 100644
--- a/spring-remoting/remoting-hessian-burlap/pom.xml
+++ b/spring-remoting/remoting-hessian-burlap/pom.xml
@@ -6,11 +6,13 @@
     <artifactId>remoting-hessian-burlap</artifactId>
     <packaging>pom</packaging>
 	<name>remoting-hessian-burlap</name>
+    <version>1.0-SNAPSHOT</version>
 	
 	<parent>
-        <artifactId>spring-remoting</artifactId>
+        <artifactId>parent-boot-1</artifactId>
         <groupId>com.baeldung</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-1</relativePath>
     </parent>
 
     <modules>
diff --git a/spring-zuul/pom.xml b/spring-zuul/pom.xml
index b662b2ef6a..a8c891cd89 100644
--- a/spring-zuul/pom.xml
+++ b/spring-zuul/pom.xml
@@ -1,7 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <groupId>com.baeldung</groupId>
     <artifactId>spring-zuul</artifactId>
     <version>1.0.0-SNAPSHOT</version>
@@ -38,11 +39,22 @@
 
     <properties>
         <!-- Spring -->
-        <spring-cloud.version>1.2.7.RELEASE</spring-cloud.version>
+        <spring-cloud.version>2.1.0.RC3</spring-cloud.version>
         <!-- util -->
         <commons-lang3.version>3.5</commons-lang3.version>
         <!-- Maven plugins -->
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>http://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
 </project>
\ No newline at end of file
diff --git a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java b/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java
index 9f1d2e162b..77eabe771b 100644
--- a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java
+++ b/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java
@@ -2,7 +2,7 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class ResourceServerApplication extends SpringBootServletInitializer {
diff --git a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java b/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java
index c040c8ac42..1a45d20edb 100644
--- a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java
+++ b/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java
@@ -3,11 +3,11 @@ package org.baeldung.config;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @EnableWebMvc
 @ComponentScan({ "org.baeldung.web.controller" })
-public class ResourceServerWebConfig extends WebMvcConfigurerAdapter {
+public class ResourceServerWebConfig implements WebMvcConfigurer {
 
 }
diff --git a/spring-zuul/spring-zuul-foos-resource/src/main/resources/application.properties b/spring-zuul/spring-zuul-foos-resource/src/main/resources/application.properties
index 94c0984ac3..9298027030 100644
--- a/spring-zuul/spring-zuul-foos-resource/src/main/resources/application.properties
+++ b/spring-zuul/spring-zuul-foos-resource/src/main/resources/application.properties
@@ -1,2 +1,2 @@
-server.contextPath=/spring-zuul-foos-resource
-server.port=8081
\ No newline at end of file
+server.servlet.context-path=/spring-zuul-foos-resource
+server.port=8081
diff --git a/spring-zuul/spring-zuul-ui/pom.xml b/spring-zuul/spring-zuul-ui/pom.xml
index 6090f5f8b8..159decd331 100644
--- a/spring-zuul/spring-zuul-ui/pom.xml
+++ b/spring-zuul/spring-zuul-ui/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zuul</artifactId>
+            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
             <version>${spring-cloud.version}</version>
         </dependency>
         <!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-netflix-core</artifactId> <version>1.0.4.RELEASE</version> </dependency> -->
diff --git a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiApplication.java b/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiApplication.java
index b8eda25960..d3e13639ef 100644
--- a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiApplication.java
+++ b/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiApplication.java
@@ -2,7 +2,7 @@ package org.baeldung.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
 
 @EnableZuulProxy
diff --git a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiWebConfig.java b/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiWebConfig.java
index 0732182354..7cda1f0e95 100644
--- a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiWebConfig.java
+++ b/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiWebConfig.java
@@ -7,11 +7,11 @@ import org.springframework.web.servlet.config.annotation.DefaultServletHandlerCo
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @EnableWebMvc
-public class UiWebConfig extends WebMvcConfigurerAdapter {
+public class UiWebConfig implements WebMvcConfigurer {
 
     @Bean
     public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
@@ -25,7 +25,6 @@ public class UiWebConfig extends WebMvcConfigurerAdapter {
 
     @Override
     public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
         registry.addViewController("/").setViewName("forward:/index");
         registry.addViewController("/index");
         registry.addViewController("/login");