1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-01 01:35:59 +01:00
Commit graph

64 commits

Author SHA1 Message Date
Florian Schmaus
08c228ef99 Merge branch '4.2' 2017-03-20 14:57:42 +01:00
Florian Schmaus
140e8faae3 Add Smack logo
thanks to Muhammad Bilal Siddiq for providing these.
2017-03-18 17:49:38 +01:00
Florian Schmaus
1a93b448db Smack 4.2.0
-----BEGIN PGP SIGNATURE-----
 
 iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAljDKBtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
 NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
 IFJB7Qf6AlkwpzMqq1g18jzEBFVX/3Sk2QWivEY7t3EhGuSguan2VIfd1fL0P85Q
 vLBm6Pw93haIxHXKRUKc8DINwP9yuRMvUotCN2hYVgfqfByHGhDCJLTNZ9atncL5
 JToptfhdRy6kgljVZPtpXOMXKBvaO3QOuTuC5cmz8PlidsYw0yUnliPLQ36uPRWX
 eaEXXbgmkjJh35WjsaafD/uM86OCqZahfvEf3e8bkPzdAayd0OKU67+v0ArA9P2E
 CiRU5vfco/vt2Qo41aLLIEOjSFfVX6Xh/pXxfQvInMAxies0KRLi5vonOmfrWRmi
 uIblzcYRXCSaZSgVN2yF8KzmF4pzcw==
 =qETn
 -----END PGP SIGNATURE-----

Merge tag '4.2.0'

Smack 4.2.0
2017-03-10 23:35:06 +01:00
Florian Schmaus
b9b8b1a780 Smack 4.2.0 2017-03-10 21:39:01 +01:00
akrherz
6039c8a54a
Remove legacy CVS keywords 2017-01-05 12:03:36 -06:00
Florian Schmaus
e71d159b96 Smack 4.1.9
-----BEGIN PGP SIGNATURE-----
 
 iQF8BAABCgBmBQJYMZ8OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5Nzc1MDU5RjNBMjFEQ0UxNkJFNEZCQUUy
 MjM5QTdFOEY1ODUyMDUyAAoJECI5p+j1hSBSK88H/0L0gxM9Pb4Eki4KLi0iUuMy
 QtP0L7r4uLkZxgmOx7pmkY84jIRhkO2zQYubdK4qBzcGzQapHU5J6wOy/HCVVgp7
 Roys1krA3hT0sNL+jnDvsnGU1nc5eb4TftP6ie9mm2Io0nYLoMrWfgxK7FN3xUj/
 3tQn3cpkH5yIWHkaokXS45BHQEXm+uy7gvV/yqcjziyopKnsbvERLudQzFLBz+0w
 z/vljq0W0k22nrLc8syaLhgmY7uyeksqmPXC0EctMgI6HxuJyaFFwtZbATnyzfpk
 1+45QcoSkgw/2u03gZPThj/Pk0nV5h1feKYw/ZUx3VWd4UCd5cjM2on4zzWEro0=
 =OkN/
 -----END PGP SIGNATURE-----

Merge tag '4.1.9'

Smack 4.1.9
2016-11-20 14:53:44 +01:00
Florian Schmaus
af6e80decc Smack 4.1.9 2016-11-19 14:34:29 +01:00
Florian Schmaus
00134c8f50 Smack 4.1.8
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJXnGezXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5Nzc1MDU5RjNBMjFEQ0UxNkJFNEZCQUUy
 MjM5QTdFOEY1ODUyMDUyAAoJECI5p+j1hSBSo3EH/1usQTee7P4ABvL5iB2LtQtB
 B2tZdOpDWAyNass7+kP40MX544O2cFxS0NHW6vY+BJCvdn128iWJGYlFY0qLv6ON
 +cLYMs4zlBnI/o/V8siCMa/awUnUvBEe6lyHTZc2fLp9x1g/qx9GUZuOznk8CEC4
 aF6YBFbcL+uXj6Rx4mVCfBtPur+Nr64Pz2pm6T0kw0PdeFbFY9Bn9rnfPHhGl7vk
 4w7f6QJ/VsjmlQUK9s65tLoKdWlmnp7hY5fvdPeAc7jNfsIMPUMxk/JgloXrLPP3
 q0g6IKQe/40lWcyDn5doyhhncGxLcdHx4sUP+UM0MRlJyS924xCIhg2wxRkq2Ag=
 =Lfdm
 -----END PGP SIGNATURE-----

Merge tag '4.1.8'

Smack 4.1.8
2016-07-30 10:43:20 +02:00
Florian Schmaus
a87007fb77 Smack 4.1.8 2016-07-30 10:29:30 +02:00
Florian Schmaus
67cc513b2e Update releasedocs/README.html 2016-07-24 23:40:07 +02:00
Florian Schmaus
145fa02a48 Smack 4.1.7 2016-04-14 22:18:36 +02:00
Florian Schmaus
73c531f841 Smack 4.1.6 2016-01-23 12:14:40 +01:00
Florian Schmaus
06becd4ac2 Smack 4.1.5 2015-11-22 22:34:30 +01:00
Florian Schmaus
86de237b2c Smack 4.1.4 2015-09-14 08:58:21 +02:00
Florian Schmaus
f8d513e37c Smack 4.1.3 2015-07-15 09:02:46 +02:00
Florian Schmaus
54719a43e2 Smack 4.1.2 2015-06-27 14:33:14 +02:00
Florian Schmaus
56847d7f14 Smack 4.1.1 2015-05-09 15:18:38 +02:00
Florian Schmaus
4bb8aea281 Smack 4.1.0 2015-03-29 12:05:59 +02:00
Florian Schmaus
26d9a95c64 Add Smack 4.0.7 Changelog
Cherry-picked 5cf99508ad from 4.0 branch
to include the 4.0.7 changelog.

Conflicts:
	version.gradle
2015-02-20 09:39:24 +01:00
Florian Schmaus
cc09192095 Smack 4.0.6
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQF8BAABCgBmBQJUci2fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4
 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI415IIH/j1eCvLIjNqNP6ytXdgomYY+
 j2i5KRHMv69La1JqtdmAeTeZfD13549s/66I5VUfegEfaADGUPr1NGrQKlb8lJBe
 YSqthMaQUybLBuCL9Lwg/3jE6s27GixRjW/Wip4ntac1wS2R3qD18lAxYIivsGJh
 gvyGHGoXvdct6teu9X0RtmyE/EOBfV63y1gVJG07Jv5/AJ2wCh9dIOD4jFuqvkoA
 cz2OfVJOIFletBV2psLxc0VVeqU9Lpba5TZuW1ZylY61z+X2rpt9BwCgBD35jTF9
 ztP2ytQY80+vZO6uP+Tl75QxdQd/e0O9oGnYbmMp1gfYQjgETaHUDxAL2uw4XNo=
 =7UY+
 -----END PGP SIGNATURE-----

Merge tag '4.0.6'

Smack 4.0.6

Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
	version.gradle
2014-11-23 20:05:44 +01:00
Florian Schmaus
721c3559d5 Smack 4.0.6 2014-11-23 19:55:08 +01:00
Florian Schmaus
177ab983d4 Merge branch '4.0'
Conflicts:
	build.gradle
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
2014-10-22 22:25:20 +02:00
Florian Schmaus
04446e54db Smack 4.0.5 2014-10-22 22:11:07 +02:00
Florian Schmaus
ade6d528e8 Eclipse formatter: Set line length to 120
Also add new settings for Java8 features (currently not used in Smack,
as it is Java7 or higher).
2014-10-08 16:01:19 +02:00
Florian Schmaus
50e068b6a7 Merge branch '4.0'
Conflicts:
	build.gradle
2014-09-29 14:00:48 +02:00
Florian Schmaus
fc51f3df48 Add support for XEP-0198: Stream Management
- De-duplicate code by moving it into AbstractXMPPConnection
- Introduce TopLevelStreamElement as superclass for all XMPP stream elements.
- Add SynchronizationPoint, ParserUtils
- Add ParserUtils

Fixes SMACK-333 and SMACK-521
2014-09-11 09:49:16 +02:00
Florian Schmaus
aea58e0735 Add Changelog for Smack 4.0.4 2014-09-05 23:32:53 +02:00
Florian Schmaus
3743236710 Smack 4.0.3 2014-08-16 00:18:54 +02:00
Florian Schmaus
1935039432 Improve documentation (targetCompatibility, XPP3) 2014-08-01 19:19:17 +02:00
Florian Schmaus
a0564f2694 Smack 4.0.2 2014-07-27 23:59:48 +02:00
Florian Schmaus
d56252f9fb Smack 4.0.1 2014-07-20 12:59:01 +02:00
Florian Schmaus
4477561d4b Replace references to 'smack.jar'
Also don't mention the required JDK version in the README as such information
tends to become wrong easily.
2014-07-05 12:10:43 +02:00
Florian Schmaus
1fb8a50b79 Improve documentation
remove ambiguous part about smack-core being the only required
library. It's the only required library of *Smack*, but some user could
understand that Smack itself has no other dependencies. In order to
avoid such confusion, simply remove that part.
2014-06-27 12:22:39 +02:00
Florian Schmaus
1de2da8ec4 Update README.html
to point to "Smack 4 Readme and Upgrade Guide" DOC-2703
2014-06-12 18:43:51 +02:00
Florian Schmaus
6e8b51c088 Add missing 4.0.0 Changelog 2014-06-12 18:43:50 +02:00
Florian Schmaus
02d73f723f Change keyringfile example to real file
I'm always using the file and forget to s/foo/flo/
2014-04-17 13:47:19 +02:00
Georg Lukas
ab70cfec24 Refactoring: All connection classes begin with XMPP now
This commit renames classes as follows:
 * TCPConnection --> XMPPTCPConnection
 * BOSHConnection --> XMPPBOSHConnection

There are two reasons for this rename. First, it is there to indicate
that the classes actually _are_ XMPP connections, using different
transport mechanisms. Second, it makes auto-completion in IDEs easier,
the developer can type XMPP<complete> and choose the right backend.
2014-04-09 20:03:07 +02:00
Florian Schmaus
ec82f63191 Move sample/ into resources/ 2014-03-19 09:00:10 +01:00
Florian Schmaus
89ed4d7492 Edit Eclipse formatting style
- Enums go on their own line
- Enable on/off formatter tags
2014-03-12 11:12:05 +01:00
Florian Schmaus
489816c61f Renamed Connection to XMPPConnection 2014-03-10 09:45:50 +01:00
Florian Schmaus
f7d3f559a2 Fix eclipse formatter settings: indentation.size=4 2014-02-18 23:15:38 +01:00
Florian Schmaus
d069e1be64 Normalize newlines to '\n'
Change all \r\n into unix style newlines. Add missing newlines at the
end of a file and activate the newline checkstyle module, that enforces
'\n' as newline and a newline at the end of every file.
2014-02-17 23:58:40 +01:00
Florian Schmaus
1e57f1c659 Activate checkstyle and add missing license headers
Delete also all "All rights reserved" statements, as they are
unnecessary and conflict with checkstyle's header check. Delete unused
imports.
2014-02-17 20:09:55 +01:00
Florian Schmaus
201152ef42 Migrate from Ant to Gradle (SMACK-265) 2014-02-14 18:46:33 +01:00
Bill Lynch
9ff61ae9a3 No longer needed
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2121 b35dd754-fafc-0310-a699-88a17e54d16e
2003-09-28 18:48:08 +00:00
Matt Tucker
e89f7c2a57 Updates for the 1.2.1 release.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2116 b35dd754-fafc-0310-a699-88a17e54d16e
2003-09-28 18:19:33 +00:00
Gaston Dombiak
d0766b5687 Added XHTML support.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2084 b35dd754-fafc-0310-a699-88a17e54d16e
2003-09-14 14:44:42 +00:00
Matt Tucker
daee26cf12 Added info about the distribution.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2078 b35dd754-fafc-0310-a699-88a17e54d16e
2003-08-30 23:56:36 +00:00
Matt Tucker
555c85aff9 Updated for 1.2.0 release.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2075 b35dd754-fafc-0310-a699-88a17e54d16e
2003-08-29 18:48:17 +00:00
Matt Tucker
6a1cb7c2db Removed credits on individual bug fixes. Will leave that info in JIRA for now.
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2041 b35dd754-fafc-0310-a699-88a17e54d16e
2003-08-19 15:25:52 +00:00