From 07b3b8ddf7de2ff0e4a159d723db922e7669ad69 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Fri, 30 Sep 2016 09:22:23 +0100 Subject: [PATCH] Updage to tomcat 8.5.5 - Old version caused failures when running in sts due to mixed deps. - Fixes #256 --- build.gradle | 1 - gradle.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 4211ede3..212c4298 100644 --- a/build.gradle +++ b/build.gradle @@ -116,7 +116,6 @@ project('spring-statemachine-core') { testCompile "org.springframework:spring-web:$springVersion" testCompile "org.springframework:spring-webmvc:$springVersion" testCompile "org.apache.tomcat.embed:tomcat-embed-core:$tomcatEmbedVersion" - testCompile "org.apache.tomcat.embed:tomcat-embed-logging-juli:$tomcatEmbedVersion" testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion" testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion" testCompile("org.mockito:mockito-core:$mockitoVersion") { dep -> diff --git a/gradle.properties b/gradle.properties index aeaf15c6..acc52dbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ mockitoVersion = 1.9.5 hamcrestVersion=1.3 springSessionVersion=1.0.2.RELEASE curatorVersion=2.8.0 -tomcatEmbedVersion=8.0.30 +tomcatEmbedVersion=8.5.5 servletApiVersion=3.0.1 commonsPool2Version=2.4.2 hsqlVersion=2.3.1