From 86de237b2cdb08a94922b972becd0ed58738b5cd Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 14 Sep 2015 08:58:21 +0200
Subject: [PATCH] Smack 4.1.4

---
 resources/releasedocs/changelog.html | 29 ++++++++++++++++++++++++++++
 version.gradle                       |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html
index 184c15f70..688d8bd6f 100644
--- a/resources/releasedocs/changelog.html
+++ b/resources/releasedocs/changelog.html
@@ -141,6 +141,35 @@ hr {
 
 	<div id="pageBody">
 
+
+<h2>4.1.4 -- <span style="font-weight: normal;">2015-09-14</span></h2>
+
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-688'>SMACK-688</a>] -         Reset carbons state if session got not resumed or cleanly disconnected
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-689'>SMACK-689</a>] -         PEPPubSub creates malformed XML
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-693'>SMACK-693</a>] -         MultiUserChat&#39;s UserStatusListener is not getting triggered
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-695'>SMACK-695</a>] -         JSON and GCM parser does an erroneous extra next()
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-697'>SMACK-697</a>] -         PrivacyListManager should handle the case where not default and active list are currently set
+</li>
+</ul>
+
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-686'>SMACK-686</a>] -         Provide a hint that connect() needs to be called prior login() in NotConnectedException
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-687'>SMACK-687</a>] -         Update to jxmpp 0.4.2
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-696'>SMACK-696</a>] -         Drop stream state after stream error
+</li>
+</ul>
+
 <h2>4.1.3 -- <span style="font-weight: normal;">2015-07-15</span></h2>
 
 <h2>        Bug
diff --git a/version.gradle b/version.gradle
index ad05ecab1..e9955e1e4 100644
--- a/version.gradle
+++ b/version.gradle
@@ -1,7 +1,7 @@
 allprojects {
 	ext {
 		shortVersion = '4.1.4'
-		isSnapshot = true
+		isSnapshot = false
 		jxmppVersion = '0.4.2'
 		smackMinAndroidSdk = 8
 	}