From b2835e555cc909199e0b5dc13bfd1c385d29cbef Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Mon, 8 May 2017 14:37:06 -0400
Subject: [PATCH] Update to Spring AMQP 2.0.0.M4

---
 helloworld/pom.xml                                    |  4 ++--
 helloworld/src/main/resources/rabbitConfiguration.xml |  2 +-
 log4j/pom.xml                                         |  4 ++--
 log4j/src/main/resources/server-bootstrap-config.xml  |  4 ++--
 log4j/src/main/resources/servlet-config.xml           |  8 ++++----
 log4j2/pom.xml                                        |  2 +-
 rabbitmq-tutorials/pom.xml                            |  2 +-
 stocks/pom.xml                                        | 10 +++++-----
 stocks/src/main/resources/client-bootstrap-config.xml |  4 ++--
 stocks/src/main/resources/client-handlers.xml         |  2 +-
 stocks/src/main/resources/client-messaging.xml        |  6 +++---
 stocks/src/main/resources/server-bootstrap-config.xml |  6 +++---
 stocks/src/main/resources/server-handlers.xml         |  2 +-
 stocks/src/main/resources/server-jmx.xml              |  6 +++---
 stocks/src/main/resources/server-messaging.xml        |  6 +++---
 stocks/src/main/resources/server-services.xml         |  4 ++--
 stocks/src/main/resources/servlet-config.xml          |  8 ++++----
 17 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index caaec10..7e8b422 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples.spring</groupId>
 	<artifactId>spring-rabbit-helloworld</artifactId>
-	<version>2.0.0.M3</version>
+	<version>2.0.0.M4</version>
 	<packaging>jar</packaging>
 	<name>Spring AMQP Hello World</name>
 	<url>http://www.spring.io</url>
@@ -17,7 +17,7 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>4.2.5.RELEASE</spring.framework.version>
-		<spring.amqp.version>2.0.0.M3</spring.amqp.version>
+		<spring.amqp.version>2.0.0.M4</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<profiles>
diff --git a/helloworld/src/main/resources/rabbitConfiguration.xml b/helloworld/src/main/resources/rabbitConfiguration.xml
index cf53cc9..4efd25a 100644
--- a/helloworld/src/main/resources/rabbitConfiguration.xml
+++ b/helloworld/src/main/resources/rabbitConfiguration.xml
@@ -2,7 +2,7 @@
 <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.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<rabbit:connection-factory id="connectionFactory"/>
 	
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 887a696..e7c3c32 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples.spring</groupId>
 	<artifactId>spring-rabbit-log4j</artifactId>
-	<version>2.0.0.M3</version>
+	<version>2.0.0.M4</version>
 	<packaging>war</packaging>
 	<name>Spring AMQP log4j</name>
 	<url>http://www.spring.io</url>
@@ -17,7 +17,7 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>4.2.5.RELEASE</spring.framework.version>
-		<spring.amqp.version>2.0.0.M3</spring.amqp.version>
+		<spring.amqp.version>2.0.0.M4</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<profiles>
diff --git a/log4j/src/main/resources/server-bootstrap-config.xml b/log4j/src/main/resources/server-bootstrap-config.xml
index 0ea3449..0e941bc 100644
--- a/log4j/src/main/resources/server-bootstrap-config.xml
+++ b/log4j/src/main/resources/server-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.log4j.config.server"/>
diff --git a/log4j/src/main/resources/servlet-config.xml b/log4j/src/main/resources/servlet-config.xml
index 12bc081..808b323 100644
--- a/log4j/src/main/resources/servlet-config.xml
+++ b/log4j/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">
 
 	<context:component-scan
 		base-package="org.springframework.amqp.rabbit.log4j.web.controller" />
diff --git a/log4j2/pom.xml b/log4j2/pom.xml
index b23b965..8f97059 100644
--- a/log4j2/pom.xml
+++ b/log4j2/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.amqp.samples</groupId>
 	<artifactId>log4j2</artifactId>
-	<version>2.0.0.M3</version>
+	<version>2.0.0.M4</version>
 	<packaging>jar</packaging>
 
 	<name>log4j2</name>
diff --git a/rabbitmq-tutorials/pom.xml b/rabbitmq-tutorials/pom.xml
index b8ad00e..2262c12 100644
--- a/rabbitmq-tutorials/pom.xml
+++ b/rabbitmq-tutorials/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.amqp</groupId>
 	<artifactId>rabbit-tutorials</artifactId>
-	<version>2.0.0.M3</version>
+	<version>2.0.0.M4</version>
 	<packaging>jar</packaging>
 
 	<name>rabbitmq-tutorials</name>
diff --git a/stocks/pom.xml b/stocks/pom.xml
index 4ebad64..c9fae0a 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.samples.spring</groupId>
 	<artifactId>spring-rabbit-stocks</artifactId>
-	<version>2.0.0.M3</version>
+	<version>2.0.0.M4</version>
 	<packaging>war</packaging>
 	<name>Spring Rabbit Stocks</name>
 	<url>http://www.spring.io</url>
@@ -16,7 +16,7 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>4.2.5.RELEASE</spring.framework.version>
-		<spring.amqp.version>2.0.0.M3</spring.amqp.version>
+		<spring.amqp.version>2.0.0.M4</spring.amqp.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<profiles>
@@ -138,9 +138,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.0.pr3</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..6317264 100644
--- a/stocks/src/main/resources/client-handlers.xml
+++ b/stocks/src/main/resources/client-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 id="stockController" class="org.springframework.amqp.rabbit.stocks.ui.StockController">
 		<property name="stockServiceGateway" ref="stockServiceGateway"/>
diff --git a/stocks/src/main/resources/client-messaging.xml b/stocks/src/main/resources/client-messaging.xml
index 2e7bbd2..175f689 100644
--- a/stocks/src/main/resources/client-messaging.xml
+++ b/stocks/src/main/resources/client-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="stockServiceGateway" class="org.springframework.amqp.rabbit.stocks.gateway.RabbitStockServiceGateway">
-		<property name="rabbitTemplate" ref="rabbitTemplate" />
+		<property name="rabbitOperations" ref="rabbitTemplate" />
 	    <property name="defaultReplyTo" value="#{traderJoeQueue.name}" />
 	</bean>
 
diff --git a/stocks/src/main/resources/server-bootstrap-config.xml b/stocks/src/main/resources/server-bootstrap-config.xml
index 6f263f7..8ef81f7 100644
--- a/stocks/src/main/resources/server-bootstrap-config.xml
+++ b/stocks/src/main/resources/server-bootstrap-config.xml
@@ -3,9 +3,9 @@
 	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"/>
 
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..4583e76 100644
--- a/stocks/src/main/resources/server-jmx.xml
+++ b/stocks/src/main/resources/server-jmx.xml
@@ -3,8 +3,8 @@
 	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/>
 
@@ -16,4 +16,4 @@
           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..3b8a6d2 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">
@@ -15,4 +15,4 @@
 		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">