Build #396

Plan branch:

Build: #396 was successful Scheduled with changes by Guus der Kinderen and Greg Thomas <greg.d.thomas@bt.com>

Code commits

Openfire (master)

  • Greg Thomas <greg.d.thomas@bt.com>

    Greg Thomas <greg.d.thomas@bt.com> 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559

    OF-1929: Make LDAPS the default protocol, and bring out encryption settings from "Advanced"

    • i18n/src/main/resources/openfire_i18n.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_cs_CZ.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_de.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_es.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_fr.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_ja_JP.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_nl.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_pl_PL.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_pt_BR.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_pt_PT.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_ru_RU.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_sk.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • i18n/src/main/resources/openfire_i18n_zh_CN.properties (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
    • xmppserver/src/main/webapp/setup/ldap-server.jspf (version 1e102ee1ee7ddf0296dd1e6a3b6fda019e0be559)
  • Greg Thomas <greg.d.thomas@bt.com>

    Greg Thomas <greg.d.thomas@bt.com> 3287a23551c5d8035da2921020c1931c56624f45

    OF-1929: Correct the LDAP URL, update test cases, fix bug(!)

    • xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 3287a23551c5d8035da2921020c1931c56624f45)
    • xmppserver/src/test/java/org/jivesoftware/openfire/ldap/LdapManagerTest.java (version 3287a23551c5d8035da2921020c1931c56624f45)
  • Guus der Kinderen

    Guus der Kinderen c47ed3437daee079a11bf210b6ad3ed6db79b03c

    OF-1928: Properly escape displayed data.

    • xmppserver/src/main/webapp/muc-room-affiliations.jsp (version c47ed3437daee079a11bf210b6ad3ed6db79b03c)
  • Guus der Kinderen

    Guus der Kinderen bda2fc1c473ebf40d0dd5540201a718c87167850

    Smack Integration Tests: use later version of Smack and Gradle. (#1529)
    * Smack Integration Tests: use later version of Smack and Gradle.

    Recently, the integration tests have been failing a lot. Flow suggested improving the version of Gradle that's used to run them. While at it, I'm also bumping the version of Smack that we use to the latest release (4.3.4).

    • runIntegrationTests (version bda2fc1c473ebf40d0dd5540201a718c87167850)
  • Guus der Kinderen

    Guus der Kinderen b490741342c2e113e682bdbaca109999be8062ad

    Merge pull request #1429 from cpetzka/resolve_multi_threading_issues_in_LocalMUCRoom
    OF-1930: Make LocalMUCRoom more thread safe

  • cpetzka <31418387+cpetzka@users.noreply.github.com>

    cpetzka <31418387+cpetzka@users.noreply.github.com> 38d20885cb6da904a9664361db30a4887e011f99 m

    fix a concurrent modification bug in LocalMUCRoom

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 38d20885cb6da904a9664361db30a4887e011f99)
  • cpetzka <31418387+cpetzka@users.noreply.github.com>

    cpetzka <31418387+cpetzka@users.noreply.github.com> 22092ecae4cce263e2b9d1ef22c8127cc9c282a6 m

    Merge branch 'master' into resolve_multi_threading_issues_in_LocalMUCRoom

  • cpetzka <31418387+cpetzka@users.noreply.github.com>

    cpetzka <31418387+cpetzka@users.noreply.github.com> 1e3bbf42531fc45d7e91db4cee753e133242cc2e m

    refactor the occupants computation in LocalMUCRoom

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 1e3bbf42531fc45d7e91db4cee753e133242cc2e)
  • cpetzka <31418387+cpetzka@users.noreply.github.com>

    cpetzka <31418387+cpetzka@users.noreply.github.com> 06bc632d69818756e603c229464c4c763af9e0e1 m

    release write lock in LocalMUCRoom earlier

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 06bc632d69818756e603c229464c4c763af9e0e1)
  • cpetzka <31418387+cpetzka@users.noreply.github.com>

    cpetzka <31418387+cpetzka@users.noreply.github.com> 452fc0995ffbd6cd526985f892f441f9dff34384 m

    make the LocalMUCRoom more thread safe

    • xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java (version 452fc0995ffbd6cd526985f892f441f9dff34384)