- upgrade smack to 4.2.4 - http://download.igniterealtime.org/smack/d…

…ocs/latest/changelog.html

- upgrade logback to 1.2.3

CHANGELOG.md

@@ -2,13 +2,22 @@
 All notable changes to the fcm xmpp server v2 project will be documented in this file, in a per release basis.
 
 ## [unreleased]
-**Tag**: xmpp_r1_v6
+**Tag**: xmpp_r1_v7
 
 ### Added
 - a better solution for the connection draining (A manager class will be added)
 
 -------------------------------------------------------------------------------------
 
+## [xmpp_r1_v6] - 2018-05-01
+**Tag**: xmpp_r1_v6
+
+### Modified
+- upgrade smack to 4.2.4 - http://download.igniterealtime.org/smack/docs/latest/changelog.html
+- upgrade logback to 1.2.3
+
+-------------------------------------------------------------------------------------
+
 ## [xmpp_r1_v5] - 2018-04-24
 **Tag**: xmpp_r1_v5
 

google-formatter.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE xml>
 <profiles version="13">
 <profile kind="CodeFormatterProfile" name="GoogleStyle" version="13">
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>

pom.xml

@@ -4,17 +4,17 @@
 
 	<groupId>com.wedevol</groupId>
 	<artifactId>xmppserver2</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<packaging>jar</packaging>
 	<name>FCM XMPP Server</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<smack.version>4.2.3</smack.version>
+		<smack.version>4.2.4</smack.version>
 		<jackson.version>2.9.5</jackson.version>
-		<logback.version>1.0.13</logback.version>
+		<logback.version>1.2.3</logback.version>
 	</properties>
 
 	<dependencies>

src/main/java/com/wedevol/xmpp/server/CcsClient.java

@@ -137,7 +137,7 @@ public void connect() throws XMPPException, SmackException, IOException, Interru
     xmppConn.addAsyncStanzaListener(this, stanza -> stanza.hasExtension(Util.FCM_ELEMENT_NAME, Util.FCM_NAMESPACE));
 
     // Log all outgoing packets
-    xmppConn.addPacketInterceptor(stanza -> logger.info("Sent: {}", stanza.toXML()), ForEveryStanza.INSTANCE);
+    xmppConn.addStanzaInterceptor(stanza -> logger.info("Sent: {}", stanza.toXML()), ForEveryStanza.INSTANCE);
 
     // Set the ping interval
     final PingManager pingManager = PingManager.getInstanceFor(xmppConn);
@@ -505,11 +505,11 @@ public void disconnectAll() {
       ReconnectionManager.getInstanceFor(xmppConn).removeReconnectionListener(this);
       xmppConn.removeAsyncStanzaListener(this);
       xmppConn.removeConnectionListener(this);
-      xmppConn.removePacketInterceptor(this);
+      xmppConn.removeStanzaInterceptor(this);
       xmppConn.removeAllRequestAckPredicates();
       xmppConn.removeAllStanzaAcknowledgedListeners();
       xmppConn.removeAllStanzaIdAcknowledgedListeners();
-      xmppConn.removePacketSendingListener(this);
+      xmppConn.removeStanzaSendingListener(this);
       xmppConn.removeStanzaAcknowledgedListener(this);
       xmppConn.removeAllRequestAckPredicates();
       logger.info("Disconnecting the xmpp server from FCM.");