diff --git a/.gitignore b/.gitignore
index 08f570ad06..693a35c176 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ spring-call-getters-using-reflection/.mvn/wrapper/maven-wrapper.properties
 spring-check-if-a-property-is-null/.mvn/wrapper/maven-wrapper.properties
 *.springBeans
 
+20171220-JMeter.csv
diff --git a/jackson/pom.xml b/jackson/pom.xml
index 001fde5021..2587e61ac1 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -129,7 +129,7 @@
 
     <properties>
         <!-- marshalling -->
-        <jackson.version>2.9.2</jackson.version>
+        <jackson.version>2.9.4</jackson.version>
 
         <!-- util -->
         <guava.version>19.0</guava.version>
diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index b939f0496d..9d90ba2dbf 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -297,7 +297,7 @@
         <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
         <org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
         <thymeleaf.version>2.1.5.RELEASE</thymeleaf.version>
-        <jackson.version>2.8.5</jackson.version>
+        <jackson.version>2.9.4</jackson.version>
 
         <!-- persistence -->
         <hibernate.version>5.2.5.Final</hibernate.version>
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java
index b9a8336bf2..69c45d90b3 100644
--- a/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java
+++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/configuration/ApplicationConfiguration.java
@@ -1,14 +1,21 @@
 package com.baeldung.spring.configuration;
 
+import com.baeldung.spring.controller.rss.ArticleRssFeedViewResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.view.ContentNegotiatingViewResolver;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
+import org.springframework.web.accept.ContentNegotiationManager;
+
+import java.util.List;
+import java.util.ArrayList;
 
 @Configuration
 @EnableWebMvc
@@ -21,11 +28,19 @@ class ApplicationConfiguration implements WebMvcConfigurer {
     }
 
     @Bean
-    public InternalResourceViewResolver jspViewResolver() {
-        InternalResourceViewResolver bean = new InternalResourceViewResolver();
-        bean.setPrefix("/WEB-INF/views/");
-        bean.setSuffix(".jsp");
-        return bean;
+    public ContentNegotiatingViewResolver viewResolver(ContentNegotiationManager cnManager) {
+        ContentNegotiatingViewResolver cnvResolver = new ContentNegotiatingViewResolver();
+        cnvResolver.setContentNegotiationManager(cnManager);
+        List<ViewResolver> resolvers = new ArrayList<>();
+
+        InternalResourceViewResolver bean = new InternalResourceViewResolver("/WEB-INF/views/",".jsp");
+        ArticleRssFeedViewResolver articleRssFeedViewResolver = new ArticleRssFeedViewResolver();
+
+        resolvers.add(bean);
+        resolvers.add(articleRssFeedViewResolver);
+
+        cnvResolver.setViewResolvers(resolvers);
+        return cnvResolver;
     }
 
     @Bean
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssController.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssController.java
index 1f51b238ac..8f23076e8e 100644
--- a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssController.java
+++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssController.java
@@ -1,14 +1,59 @@
 package com.baeldung.spring.controller.rss;
 
+import com.rometools.rome.feed.synd.*;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedOutput;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Controller
 public class ArticleRssController {
 
-    @GetMapping(value = "/rss", produces = "application/*")
-    public String articleFeed() {
+    @GetMapping(value = "/rssMvc")
+    public String articleMvcFeed() {
         return "articleFeedView";
     }
 
+    @GetMapping(value = "/rssRest", produces = "application/rss+xml")
+    @ResponseBody
+    public String articleRestFeed() throws FeedException {
+        SyndFeed feed = new SyndFeedImpl();
+        feed.setFeedType("rss_2.0");
+        feed.setLink("http://localhost:8080/spring-mvc-simple/rss");
+        feed.setTitle("Article Feed");
+        feed.setDescription("Article Feed Description");
+        feed.setPublishedDate(new Date());
+
+        List list = new ArrayList<SyndEntry>();
+
+        SyndEntry item1 = new SyndEntryImpl();
+        item1.setLink("http://www.baeldung.com/netty-exception-handling");
+        item1.setTitle("Exceptions in Netty");
+        SyndContent description1 = new SyndContentImpl();
+        description1.setValue("In this quick article, we’ll be looking at exception handling in Netty.");
+        item1.setDescription(description1);
+        item1.setPublishedDate(new Date());
+        item1.setAuthor("Carlos");
+
+        SyndEntry item2 = new SyndEntryImpl();
+        item2.setLink("http://www.baeldung.com/cockroachdb-java");
+        item2.setTitle("Guide to CockroachDB in Java");
+        SyndContent description2 = new SyndContentImpl();
+        description2.setValue("This tutorial is an introductory guide to using CockroachDB with Java.");
+        item2.setDescription(description2);
+        item2.setPublishedDate(new Date());
+        item2.setAuthor("Baeldung");
+
+        list.add(item1);
+        list.add(item2);
+        feed.setEntries(list);
+
+        return new SyndFeedOutput().outputString(feed);
+    }
+
 }
diff --git a/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssFeedViewResolver.java b/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssFeedViewResolver.java
new file mode 100644
index 0000000000..6be06c4812
--- /dev/null
+++ b/spring-mvc-simple/src/main/java/com/baeldung/spring/controller/rss/ArticleRssFeedViewResolver.java
@@ -0,0 +1,15 @@
+package com.baeldung.spring.controller.rss;
+
+import org.springframework.web.servlet.View;
+import org.springframework.web.servlet.ViewResolver;
+
+import java.util.Locale;
+
+public class ArticleRssFeedViewResolver implements ViewResolver {
+
+    @Override
+    public View resolveViewName(String s, Locale locale) throws Exception {
+        ArticleFeedView articleFeedView = new ArticleFeedView();
+        return articleFeedView;
+    }
+}