From c0e721b92e30f486324ad4fe0c6b4d69f68a3ffb Mon Sep 17 00:00:00 2001
From: tschiman <tschiman@gmail.com>
Date: Thu, 17 Nov 2016 20:32:05 -0700
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	spring-session/jetty-session-demo/src/main/java/com/baeldung/spring/session/jettyex/JettyWebApplication.java
#	spring-session/tomcat-session-demo/src/main/java/com/baeldung/spring/session/tomcatex/TestController.java
---
 spring-session/tomcat-session-demo/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/spring-session/tomcat-session-demo/pom.xml b/spring-session/tomcat-session-demo/pom.xml
index 805d7bec25..0a101e73a6 100644
--- a/spring-session/tomcat-session-demo/pom.xml
+++ b/spring-session/tomcat-session-demo/pom.xml
@@ -32,6 +32,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>