From e2af9fb62909dc2d0c075f8a5d99f7c22d51b486 Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@gopivotal.com>
Date: Fri, 13 Dec 2013 17:32:29 -0500
Subject: [PATCH] Updated MQTTMessageConverter to use new classpath

Conflicts:
	spring-integration-mqtt/build.gradle
---
 spring-integration-mqtt/build.gradle                            | 1 +
 .../integration/mqtt/support/DefaultPahoMessageConverter.java   | 2 +-
 .../integration/mqtt/support/MqttMessageConverter.java          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-integration-mqtt/build.gradle b/spring-integration-mqtt/build.gradle
index 8ae90b9..1ca8182 100644
--- a/spring-integration-mqtt/build.gradle
+++ b/spring-integration-mqtt/build.gradle
@@ -14,6 +14,7 @@ apply plugin: 'idea'
 group = 'org.springframework.integration'
 
 repositories {
+	maven { url 'http://repo.spring.io/libs-snapshot' }
 	maven { url 'http://repo.springsource.org/milestone' }
 	maven { url 'https://repo.eclipse.org/content/repositories/paho-releases/' }
 	maven { url 'http://repo.springsource.org/plugins-release' }
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
index 63f61c6..5f4a5f0 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
@@ -20,7 +20,7 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.support.converter.MessageConversionException;
+import org.springframework.messaging.converter.MessageConversionException;
 import org.springframework.util.Assert;
 
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java
index 146a7a6..aefbff3 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java
@@ -18,7 +18,7 @@ package org.springframework.integration.mqtt.support;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 
 import org.springframework.messaging.Message;
-import org.springframework.messaging.support.converter.MessageConverter;
+import org.springframework.messaging.converter.MessageConverter;
 
 /**
  * Extension of {@link MessageConverter} allowing the topic to be added as