From f23c679f676858fd6f9541215828ac402e9d13fd Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Sat, 21 Jan 2017 11:15:51 -0500
Subject: [PATCH] Update to Spring AMQP 1.6.7

Also added a note to the 5.0 migration guide about the change of
`AMQPHeaders.CORRELATION_ID` from `byte[]` to `String`.
---
 build.gradle                                                    | 2 +-
 .../integration/amqp/support/DefaultAmqpHeaderMapper.java       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f2a3c0a046..725640cbcb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,7 +127,7 @@ subprojects { subproject ->
 		slf4jVersion = "1.7.21"
 		tomcatVersion = "8.0.33"
 		smackVersion = '4.1.7'
-		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.6.RELEASE'
+		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.6.7.RELEASE'
 		springDataJpaVersion = '1.10.1.RELEASE'
 		springDataMongoVersion = '1.9.1.RELEASE'
 		springDataRedisVersion = '1.7.1.RELEASE'
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java
index 5cd0b78037..7366b2d6e8 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java
@@ -159,6 +159,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper<MessagePropert
 			if (StringUtils.hasText(contentType)) {
 				headers.put(AmqpHeaders.CONTENT_TYPE, contentType);
 			}
+			@SuppressWarnings("deprecation")
 			byte[] correlationId = amqpMessageProperties.getCorrelationId();
 			if (correlationId != null && correlationId.length > 0) {
 				headers.put(AmqpHeaders.CORRELATION_ID, correlationId);
@@ -248,6 +249,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper<MessagePropert
 	 * Maps headers from a Spring Integration MessageHeaders instance to the MessageProperties
 	 * of an AMQP Message.
 	 */
+	@SuppressWarnings("deprecation")
 	@Override
 	protected void populateStandardHeaders(Map<String, Object> headers, MessageProperties amqpMessageProperties) {
 		String appId = getHeaderIfAvailable(headers, AmqpHeaders.APP_ID, String.class);