diff --git a/README.md b/README.md
index f4026b3e1..f9ec1f48b 100644
--- a/README.md
+++ b/README.md
@@ -3,20 +3,23 @@ Smack
[![Build Status](https://travis-ci.org/igniterealtime/Smack.svg?branch=master)](https://travis-ci.org/igniterealtime/Smack) [![Coverage Status](https://coveralls.io/repos/igniterealtime/Smack/badge.svg)](https://coveralls.io/r/igniterealtime/Smack) [![Project Stats](https://www.openhub.net/p/smackxmpp/widgets/project_thin_badge.gif)](https://www.openhub.net/p/smackxmpp) [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/3480125) [![Visit our IRC channel](https://kiwiirc.com/buttons/irc.freenode.net/smack.png)](https://kiwiirc.com/client/irc.freenode.net/smack)
-Instructions how to use Smack in your Java or Android project are provided in the [Smack 4.1 Readme and Upgrade Guide](https://github.com/igniterealtime/Smack/wiki/Smack-4.1-Readme-and-Upgrade-Guide).
-
About
-----
-[Smack] is an open source, highly modular, easy to use, XMPP client library written in Java for JVMs and Android.
+[Smack] is an open source, highly modular, easy to use, XMPP client library written in Java for Java SE compatible JVMs and Android.
-A pure Java library, it can be embedded into your applications to create anything from a full XMPP client to simple XMPP integrations such as sending notification messages and presence-enabling devices.
+A pure Java library, it can be embedded into your applications to create anything from a full XMPP instant messaging client to simple XMPP integrations such as sending notification messages and presence-enabling devices.
Smack and XMPP allows you to easily exchange data, in various ways e.g. fire-and-forget, publish-subscribe, between human and non-human endpoints (M2M, IoT, …).
Confused? Have a look at the [Overview](documentation/overview.md).
[Smack] - an [Ignite Realtime] community project.
+Getting started
+---------------
+
+Instructions how to use Smack in your Java or Android project are provided in the [Smack 4.2 Readme and Upgrade Guide](https://github.com/igniterealtime/Smack/wiki/Smack-4.2-Readme-and-Upgrade-Guide).
+
Bug Reporting
-------------
@@ -48,7 +51,7 @@ The guidelines also contain development quickstart instructions.
Resources
---------
-- Bug Tracker: http://issues.igniterealtime.org/browse/SMACK
+- Bug Tracker: https://issues.igniterealtime.org/browse/SMACK
- JaCoCo Coverage Reports: https://www.igniterealtime.org/builds/smack/dailybuilds/jacoco/html/
- Nightly Builds: http://www.igniterealtime.org/downloads/nightly_smack.jsp
- Nightly Javadoc: http://www.igniterealtime.org/builds/smack/dailybuilds/javadoc/
@@ -57,6 +60,7 @@ Resources
- Dev Forum: http://community.igniterealtime.org/community/developers/smack
- Maven Releases: https://oss.sonatype.org/content/repositories/releases/org/igniterealtime/smack/
- Maven Snapshots: https://oss.sonatype.org/content/repositories/snapshots/org/igniterealtime/smack/
+- Nightly Unique Maven Snapshots: https://igniterealtime.org/repo/
Donate
------
diff --git a/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html
index cb513e360..b8909c036 100644
--- a/resources/releasedocs/changelog.html
+++ b/resources/releasedocs/changelog.html
@@ -141,6 +141,140 @@ hr {
+
4.2.0 -- 2017-03-10
+
+
Sub-task
+
+
+- [SMACK-639] - Add support for pre-approved subscription requests (RFC 6121 § 3.4)
+
+
+
+
Bug
+
+
+- [SMACK-306] - loadRosterOnLogin has non-trivial side effect on getRoster
+
+- [SMACK-416] - Refactor PEP to make it use the existing pubsub API.
+
+- [SMACK-674] - PubSub Affiliation extension element is missing 'jid' attribute, and is using wrong element name 'subscription'
+
+- [SMACK-682] - Add support for "XEP-0360: Nonzas (are not Stanzas)"
+
+- [SMACK-683] - Using a Proxy with XMPPTCPConnection failes with "SocketException: Unconnected sockets not implemented"
+
+- [SMACK-691] - Add support for MUCItem's Actor 'nick'
+
+- [SMACK-705] - PubSub's Affiliation.getElementName() returns wrong name
+
+- [SMACK-722] - SASL X-OAUTH2 implementation incorrectly performs Base64 encoding twice
+
+- [SMACK-723] - Support "Caps Optimizations" (XEP-0115 § 8.4)
+
+- [SMACK-724] - Do not re-use the Socket after connect() failed.
+
+- [SMACK-725] - ReconnectionManager should handle AlreadyConnectedException and AlreadyLoggedInException not as failure
+
+- [SMACK-741] - Ad-hoc command 'note' element 'type' attribute should be treated as optional
+
+- [SMACK-745] - Memory leak in MultiUserChat
+
+
+
+
New Feature
+
+
+- [SMACK-366] - Add support for DNSSEC.
+
+- [SMACK-610] - Add support for XEP-0080: User Location
+
+- [SMACK-619] - Add roomDestroyed to MUC UserStatusListener
+
+- [SMACK-625] - Add support for XEP-313: Message Archive Management
+
+- [SMACK-675] - Add support for PubSub affiliation actions as owner
+
+- [SMACK-677] - Add support for SASL 'authzid' (Authorization Identity)
+
+- [SMACK-690] - Add support for DNS-Based Authentication of Named Entities (DANE, RFC 6698)
+
+- [SMACK-731] - Add support for XEP-0191: Blocking Command
+
+- [SMACK-732] - Smack should be able to handle "single equals sign" SASL responses
+
+- [SMACK-740] - Add support for Multi-User Chat Light
+
+- [SMACK-742] - Add support for XEP-0133: Service Administration
+
+- [SMACK-747] - Add support for XEP-0363: HTTP File Upload
+
+
+
+
Task
+
+
+- [SMACK-638] - Call connection creation listeners from within AbstractXMPPConnection's constructor
+
+- [SMACK-644] - Throw exception if account creation or password change is performed over insecure connections
+
+- [SMACK-655] - Enable StreamManagement by default
+
+
+
+
Improvement
+
+
+- [SMACK-372] - Make package protected methods in PEPItem public
+
+- [SMACK-572] - Rejoin MUC rooms after reconnect
+
+- [SMACK-628] - Rework Roster handling with anonymous connections
+
+- [SMACK-629] - Rework how Smack handles anonymous connections
+
+- [SMACK-631] - Improve ParsingExceptionCallback, allow it to be a functional interface
+
+- [SMACK-632] - Make Smack interruptible
+
+- [SMACK-633] - Allow clean and graceful disconnects (stream closing)
+
+- [SMACK-634] - Use jxmpp-jid, add Jid class to replace String's being used as JIDs
+
+- [SMACK-646] - Add support for MUC roomnick rewrite
+
+- [SMACK-647] - Don't automatically call login() on connect() if the connection was authenticated before
+
+- [SMACK-648] - Improve MultiUserChat API
+
+- [SMACK-657] - Rename RosterEntry.getStatus and RosterPacket.ItemStatus to ItemAskStatus
+
+- [SMACK-663] - Roster should be fully loaded when Roster.getInstanceFor(XMPPConnection) is called with a authenticated connection
+
+- [SMACK-665] - Rename 'serviceName' to 'xmppServiceDomain'
+
+- [SMACK-666] - Typo in 'RosterEntries.rosterEntires()', change to 'RosterEntries.rosterEntries()'
+
+- [SMACK-703] - Limit the stored presences of entities not in Roster
+
+- [SMACK-704] - Pass down Message stanza in ChatStateListener
+
+- [SMACK-711] - Improve the logging of TCP connection attempts.
+
+- [SMACK-720] - Improve support for Tor and Hidden Services.
+
+- [SMACK-721] - Report illegal Stream Management states to avoid OOM Exception
+
+- [SMACK-727] - Add partial support for the IoT XEPs (XEP-0323, -0324, -0325, -0347)
+
+- [SMACK-733] - Handle outgoing 'unavailable' Presences in Roster
+
+- [SMACK-736] - Add support for Chat Markers (XEP-0333)
+
+- [SMACK-737] - Add support for Bits of Binary (XEP-0231)
+
+- [SMACK-738] - Add support for Push Notifications (XEP-0357)
+
+
4.1.9 -- 2016-11-19
diff --git a/version.gradle b/version.gradle
index 349597016..10fcf691d 100644
--- a/version.gradle
+++ b/version.gradle
@@ -1,7 +1,7 @@
allprojects {
ext {
- shortVersion = '4.2.0-rc4'
- isSnapshot = true
+ shortVersion = '4.2.0'
+ isSnapshot = false
jxmppVersion = '0.5.0'
smackMinAndroidSdk = 8
}