From bf992272965a4ad413fad77e62b9158648f10049 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Fri, 5 Sep 2014 21:59:52 +0200
Subject: [PATCH 1/3] Smack 4.0.5-SNAPSHOT

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a3578b827..95ca0aa88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,8 +16,8 @@ allprojects {
 	apply plugin: 'eclipse'
 
 	ext {
-		shortVersion = '4.0.4'
-		isSnapshot = false
+		shortVersion = '4.0.5'
+		isSnapshot = true
 		gitCommit = getGitCommit()
 		javadocAllDir = new File(buildDir, 'javadoc')
 		documentationDir = new File(buildDir, 'documentation')

From aea58e0735d8754a3d7e32b64df7069ee7256b9e Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Fri, 5 Sep 2014 23:32:53 +0200
Subject: [PATCH 2/3] Add Changelog for Smack 4.0.4

---
 resources/releasedocs/changelog.html | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html
index b3040bd4d..e7ad391c7 100644
--- a/resources/releasedocs/changelog.html
+++ b/resources/releasedocs/changelog.html
@@ -141,6 +141,23 @@ hr {
 
 	<div id="pageBody">
 
+<h2>4.0.4 -- <span style="font-weight: normal;">2014-09-05</span></h2>
+
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-596'>SMACK-596</a>] -         Smack should load roster before sending the initial presence
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-598'>SMACK-598</a>] -         Smack should allow the empty string as content of message body element
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-601'>SMACK-601</a>] -         PubSub ItemProvider does only process the outermost namespace definition when creating PayloadItems
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-602'>SMACK-602</a>] -         PacketCollector must handle InterruptException
+</li>
+<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-603'>SMACK-603</a>] -         XMPPError.Condition.equals() should be null-safe
+</li>
+</ul>
+
 <h2>4.0.3 -- <span style="font-weight: normal;">2014-08-16</span></h2>
 
 <h2>        Bug

From 039fac7ab7a00f507d11ba0cc8296ef555fd7d14 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 29 Sep 2014 13:52:13 +0200
Subject: [PATCH 3/3] Fix PingManager.ping(String,long)

ignoring timeout. SMACK-609
---
 .../main/java/org/jivesoftware/smackx/ping/PingManager.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
index 7f5d1a658..7dc506191 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
@@ -164,7 +164,7 @@ public class PingManager extends Manager {
      * by the entity.
      * 
      * @param jid The id of the entity the ping is being sent to
-     * @param pingTimeout The time to wait for a reply
+     * @param pingTimeout The time to wait for a reply in milliseconds
      * @return true if a reply was received from the entity, false otherwise.
      * @throws NoResponseException if there was no response from the jid.
      * @throws NotConnectedException 
@@ -172,7 +172,7 @@ public class PingManager extends Manager {
     public boolean ping(String jid, long pingTimeout) throws NotConnectedException, NoResponseException {
         Ping ping = new Ping(jid);
         try {
-            connection().createPacketCollectorAndSend(ping).nextResultOrThrow();
+            connection().createPacketCollectorAndSend(ping).nextResultOrThrow(pingTimeout);
         }
         catch (XMPPException exc) {
             return jid.equals(connection().getServiceName());