diff options
| author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-02-13 08:46:46 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-02-13 10:35:41 +0200 |
| commit | 56e7ac70f6bddabbfad31837b448bd5eb7f59e1c (patch) | |
| tree | 705f20497ae9cb889956ce865a2d3f92d4315c5e /test | |
| parent | cf8c8b150fedd94efda15bb1984f859557c08001 (diff) | |
| download | vaadin-framework-56e7ac70f6bddabbfad31837b448bd5eb7f59e1c.tar.gz vaadin-framework-56e7ac70f6bddabbfad31837b448bd5eb7f59e1c.zip | |
Update test for Spring 1.5.1.RELEASE (#8535)
Also fixed servlet API dependency scope that was causing conflicts.
Diffstat (limited to 'test')
| -rw-r--r-- | test/pom.xml | 1 | ||||
| -rw-r--r-- | test/spring-boot/pom.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/pom.xml b/test/pom.xml index a04bce945b..553e8baee3 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> |