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
This commit is contained in:
tschiman 2016-11-17 20:32:05 -07:00
parent 63f7ffedf8
commit c0e721b92e
1 changed files with 5 additions and 0 deletions

View File

@ -32,6 +32,11 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>