diff --git a/stocks/pom.xml b/stocks/pom.xml
index 30ec1e8..f4e8803 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -136,9 +136,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.13</version>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.6</version>
 			<scope>runtime</scope>
 		</dependency>
 
diff --git a/stocks/src/main/resources/client-bootstrap-config.xml b/stocks/src/main/resources/client-bootstrap-config.xml
index bce686d..45d0855 100644
--- a/stocks/src/main/resources/client-bootstrap-config.xml
+++ b/stocks/src/main/resources/client-bootstrap-config.xml
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<!--  pick up rabbit broker configuration -->
 	<context:component-scan base-package="org.springframework.amqp.rabbit.stocks.config.client"/>
diff --git a/stocks/src/main/resources/client-handlers.xml b/stocks/src/main/resources/client-handlers.xml
index 94a5d61..1e648d8 100644
--- a/stocks/src/main/resources/client-handlers.xml
+++ b/stocks/src/main/resources/client-handlers.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="stockController" class="org.springframework.amqp.rabbit.stocks.ui.StockController">
 		<property name="stockServiceGateway" ref="stockServiceGateway"/>
 	</bean>
-	
+
 	<bean id="clientHandler" class="org.springframework.amqp.rabbit.stocks.handler.ClientHandler">
 		<property name="stockController" ref="stockController"/>
-	</bean>	
+	</bean>
 
 </beans>
diff --git a/stocks/src/main/resources/client-messaging.xml b/stocks/src/main/resources/client-messaging.xml
index 2e7bbd2..08de029 100644
--- a/stocks/src/main/resources/client-messaging.xml
+++ b/stocks/src/main/resources/client-messaging.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:rabbit="http://www.springframework.org/schema/rabbit"
-	xsi:schemaLocation="http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="stockServiceGateway" class="org.springframework.amqp.rabbit.stocks.gateway.RabbitStockServiceGateway">
 		<property name="rabbitTemplate" ref="rabbitTemplate" />
diff --git a/stocks/src/main/resources/server-bootstrap-config.xml b/stocks/src/main/resources/server-bootstrap-config.xml
index 6f263f7..2067179 100644
--- a/stocks/src/main/resources/server-bootstrap-config.xml
+++ b/stocks/src/main/resources/server-bootstrap-config.xml
@@ -3,15 +3,15 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:task="http://www.springframework.org/schema/task"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<context:property-placeholder system-properties-mode="OVERRIDE"/>
 
 	<!--  pick up rabbit broker configuration -->
 	<context:component-scan base-package="org.springframework.amqp.rabbit.stocks.config.server"/>
-	
+
 	<import resource="classpath:server-handlers.xml" />
 	<import resource="classpath:server-messaging.xml" />
 	<import resource="classpath:server-services.xml" />
@@ -20,5 +20,5 @@
 	<task:scheduled-tasks>
 		<task:scheduled ref="marketDataGateway" method="sendMarketData" fixed-delay="5000"/>
 	</task:scheduled-tasks>
-	
+
 </beans>
diff --git a/stocks/src/main/resources/server-handlers.xml b/stocks/src/main/resources/server-handlers.xml
index 3f97d4d..c95752e 100644
--- a/stocks/src/main/resources/server-handlers.xml
+++ b/stocks/src/main/resources/server-handlers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean name="serverHandler" class="org.springframework.amqp.rabbit.stocks.handler.ServerHandler">
 		<constructor-arg ref="executionVenueService"/>
diff --git a/stocks/src/main/resources/server-jmx.xml b/stocks/src/main/resources/server-jmx.xml
index c61a8b8..5e6f5bf 100644
--- a/stocks/src/main/resources/server-jmx.xml
+++ b/stocks/src/main/resources/server-jmx.xml
@@ -3,17 +3,17 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
     <context:mbean-export/>
 
     <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean"
           p:port="1099" />
-    
+
     <!-- Expose JMX over RMI -->
     <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry"
           p:objectName="connector:name=rmi"
           p:serviceUrl="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/myconnector" />
-	
-</beans>
\ No newline at end of file
+
+</beans>
diff --git a/stocks/src/main/resources/server-messaging.xml b/stocks/src/main/resources/server-messaging.xml
index 680462b..3630bec 100644
--- a/stocks/src/main/resources/server-messaging.xml
+++ b/stocks/src/main/resources/server-messaging.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:rabbit="http://www.springframework.org/schema/rabbit"
-	xsi:schemaLocation="http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="marketDataGateway" class="org.springframework.amqp.rabbit.stocks.gateway.RabbitMarketDataGateway">
-		<property name="rabbitTemplate" ref="rabbitTemplate" />
+		<property name="rabbitOperations" ref="rabbitTemplate" />
 	</bean>
 
 	<listener-container concurrency="5" connection-factory="connectionFactory" message-converter="jsonMessageConverter"
diff --git a/stocks/src/main/resources/server-services.xml b/stocks/src/main/resources/server-services.xml
index 29bcf31..bf88bf6 100644
--- a/stocks/src/main/resources/server-services.xml
+++ b/stocks/src/main/resources/server-services.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="executionVenueService"
 		class="org.springframework.amqp.rabbit.stocks.service.stubs.ExecutionVenueServiceStub">
@@ -10,9 +10,9 @@
 	<bean id="creditCheckService"
 		class="org.springframework.amqp.rabbit.stocks.service.stubs.CreditCheckServiceStub">
 	</bean>
-	
+
 	<bean id="tradingService"
 		class="org.springframework.amqp.rabbit.stocks.service.stubs.TradingServiceStub">
 	</bean>
-	
-</beans>
\ No newline at end of file
+
+</beans>
diff --git a/stocks/src/main/resources/servlet-config.xml b/stocks/src/main/resources/servlet-config.xml
index 3335647..6e115a1 100644
--- a/stocks/src/main/resources/servlet-config.xml
+++ b/stocks/src/main/resources/servlet-config.xml
@@ -2,10 +2,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:rabbit="http://www.springframework.org/schema/rabbit"
-	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
-		http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
+		http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<bean id="stockServiceGateway" class="org.springframework.amqp.rabbit.stocks.gateway.RabbitStockServiceGateway">
 		<property name="rabbitOperations">