From 74486a7fde273b0fee194e0ce1f936d6d264e70f Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 30 Nov 2017 10:03:20 -0500
Subject: [PATCH] Upgrade to Smack-4.2.2

https://build.spring.io/browse/INT-FATS5IC-340
---
 build.gradle                                                  | 2 +-
 .../integration/xmpp/config/XmppConnectionFactoryBean.java    | 1 +
 .../xmpp/inbound/ChatMessageListeningEndpointTests.java       | 4 +---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 816e21fa4b..228b9cc909 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,7 +128,7 @@ subprojects { subproject ->
 		romeToolsVersion = '1.8.0'
 		servletApiVersion = '3.1.0'
 		slf4jVersion = "1.7.25"
-		smackVersion = '4.2.1'
+		smackVersion = '4.2.2'
 		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.1.RELEASE'
 		springDataJpaVersion = '2.0.2.RELEASE'
 		springDataMongoVersion = '2.0.2.RELEASE'
diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java
index b617967477..8261589da6 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBean.java
@@ -229,6 +229,7 @@ public class XmppConnectionFactoryBean extends AbstractFactoryBean<XMPPConnectio
 	}
 
 
+	@SuppressWarnings("deprecation")
 	private class LoggingConnectionListener implements ConnectionListener {
 
 		LoggingConnectionListener() {
diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java
index c9a92de990..5493f7fc01 100644
--- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java
+++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java
@@ -36,7 +36,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
-import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.StanzaListener;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.Message;
@@ -45,7 +44,6 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smackx.gcm.packet.GcmPacketExtension;
 import org.junit.Test;
 import org.jxmpp.jid.impl.JidCreate;
-import org.jxmpp.stringprep.XmppStringprepException;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.xmlpull.v1.XmlPullParser;
@@ -128,7 +126,7 @@ public class ChatMessageListeningEndpointTests {
 	}
 
 	@Test
-	public void testWithErrorChannel() throws NotConnectedException, XmppStringprepException, InterruptedException {
+	public void testWithErrorChannel() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		XMPPConnection connection = mock(XMPPConnection.class);
 		bf.registerSingleton(XmppContextUtils.XMPP_CONNECTION_BEAN_NAME, connection);