diff --git a/build.gradle b/build.gradle
index e333e44d5d..4ee3efcb53 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,7 +87,7 @@ subprojects { subproject ->
 	}
 
 	ext {
-		activeMqVersion = '5.13.4'
+		activeMqVersion = '5.14.3'
 		aspectjVersion = '1.8.9'
 		apacheSshdVersion = '0.14.0'
 		boonVersion = '0.33'
@@ -95,7 +95,7 @@ subprojects { subproject ->
 		commonsDbcpVersion = '1.4'
 		commonsIoVersion = '2.4'
 		commonsNetVersion = '3.4'
-		curatorVersion = '2.10.0'
+		curatorVersion = '2.11.1'
 		derbyVersion = '10.11.1.1'
 		eclipseLinkVersion = '2.5.2'
 		ftpServerVersion = '1.0.6'
@@ -106,7 +106,7 @@ subprojects { subproject ->
 		hibernateVersion = '5.2.5.Final'
 		hsqldbVersion = '2.3.3'
 		h2Version = '1.4.180'
-		jackson2Version = '2.7.3'
+		jackson2Version = '2.8.5'
 		javaxActivationVersion = '1.1.1'
 		javaxMailVersion = '1.5.5'
 		jedisVersion = '2.9.0'
@@ -129,7 +129,6 @@ subprojects { subproject ->
 		romeToolsVersion = '1.7.0'
 		servletApiVersion = '3.1.0'
 		slf4jVersion = "1.7.21"
-		tomcatVersion = "8.0.33"
 		smackVersion = '4.1.7'
 		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.BUILD-SNAPSHOT'
 		springDataJpaVersion = '2.0.0.M1'
@@ -141,6 +140,7 @@ subprojects { subproject ->
 		springRetryVersion = '1.2.0.RC1'
 		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.BUILD-SNAPSHOT'
 		springWsVersion = '2.4.0.RELEASE'
+		tomcatVersion = "8.5.9"
 		xmlUnitVersion = '1.6'
 		xstreamVersion = '1.4.7'
 	}
@@ -594,8 +594,6 @@ project('spring-integration-stomp') {
 		testCompile project(":spring-integration-event")
 		testCompile "org.apache.activemq:activemq-stomp:$activeMqVersion"
 		testCompile "org.apache.tomcat.embed:tomcat-embed-websocket:$tomcatVersion"
-
-		testRuntime "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatVersion"
 	}
 }
 
@@ -644,8 +642,6 @@ project('spring-integration-websocket') {
 
 		testCompile project(":spring-integration-event")
 		testCompile "org.apache.tomcat.embed:tomcat-embed-websocket:$tomcatVersion"
-
-		testRuntime "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatVersion"
 	}
 }
 
diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java
index 62c918dc8d..ac0804702b 100644
--- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java
+++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.tomcat.websocket.WsWebSocketContainer;
+import org.apache.tomcat.websocket.Constants;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -94,8 +94,8 @@ public class ClientWebSocketContainerTests {
 		};
 
 		Map<String, Object> userProperties = new HashMap<String, Object>();
-		userProperties.put(WsWebSocketContainer.IO_TIMEOUT_MS_PROPERTY,
-				"" + (WsWebSocketContainer.IO_TIMEOUT_MS_DEFAULT * 6));
+		userProperties.put(Constants.IO_TIMEOUT_MS_PROPERTY,
+				"" + (Constants.IO_TIMEOUT_MS_DEFAULT * 6));
 		webSocketClient.setUserProperties(userProperties);
 
 		ClientWebSocketContainer container =
diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/TomcatWebSocketTestServer.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/TomcatWebSocketTestServer.java
index d2dabc7b70..9c581fb213 100644
--- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/TomcatWebSocketTestServer.java
+++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/TomcatWebSocketTestServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ public class TomcatWebSocketTestServer implements InitializingBean, DisposableBe
 		context.addApplicationListener(WsContextListener.class.getName());
 		Tomcat.addServlet(context, "dispatcherServlet", new DispatcherServlet(this.serverContext))
 				.setAsyncSupported(true);
-		context.addServletMapping("/", "dispatcherServlet");
+		context.addServletMappingDecoded("/", "dispatcherServlet");
 	}
 
 	private String createTempDir() {