From fff80aa2beb58806fc6c0aae8acd3d4896f14666 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Mon, 13 Feb 2017 08:46:46 +0200
Subject: Update test for Spring 1.5.1.RELEASE (#8535)

Also fixed servlet API dependency scope that was causing conflicts.
---
 test/pom.xml             | 1 +
 test/spring-boot/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index f8cefa468c..885da9e7a5 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -64,6 +64,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>3.0.1</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Project modules -->
diff --git a/test/spring-boot/pom.xml b/test/spring-boot/pom.xml
index a70d4da5c5..88d0354f41 100644
--- a/test/spring-boot/pom.xml
+++ b/test/spring-boot/pom.xml
@@ -18,7 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring.boot.version>1.4.2.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
     </properties>
 
     <dependencies>
-- 
cgit v1.2.3