From 22cf7bace8f4d0dc9f0bfd74bbe4b76ff1013c2a Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 1 Nov 2021 17:53:01 +0100 Subject: [PATCH 1/2] [resources] Rename get-contributors.sh to generate-notice-file --- resources/generate-notice-file | 38 ++++++++++++++++++++++++++++++++++ resources/get-contributors.sh | 7 ------- 2 files changed, 38 insertions(+), 7 deletions(-) create mode 100755 resources/generate-notice-file delete mode 100755 resources/get-contributors.sh diff --git a/resources/generate-notice-file b/resources/generate-notice-file new file mode 100755 index 000000000..60c66bbce --- /dev/null +++ b/resources/generate-notice-file @@ -0,0 +1,38 @@ +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +SMACK_DIR=$(realpath "${SCRIPT_DIR}/..") + +cd "${SMACK_DIR}" + +TEMPFILE=$(mktemp) + +cleanup() { + rm "${TEMPFILE}" +} +trap cleanup EXIT + +git shortlog -s |\ + cut -f2- |\ + grep -v '(no author)' |\ + grep '\w \w.*' |\ + sort \ + > "${TEMPFILE}" + +readonly NOTICE_FILE="${SMACK_DIR}/NOTICE" + +cat < "${NOTICE_FILE}" + Smack + + An open-source XMPP library + maintained by Florian Schmaus + + https://igniterealtime.org/projects/smack + + +Authors: + +EOF + +cat "${TEMPFILE}" >> "${NOTICE_FILE}" diff --git a/resources/get-contributors.sh b/resources/get-contributors.sh deleted file mode 100755 index c31236464..000000000 --- a/resources/get-contributors.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -git shortlog -s |\ - cut -f2- |\ - grep -v '(no author)' |\ - grep '\w \w.*' |\ - sort From 5731e61782e33a0ae5496ce8fe03b64bb86807a0 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 1 Nov 2021 17:54:01 +0100 Subject: [PATCH 2/2] Smack 4.4.4 --- resources/releasedocs/changelog.html | 21 +++++++++++++++++++++ version | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html index 8d8e20366..92b5b2ae9 100644 --- a/resources/releasedocs/changelog.html +++ b/resources/releasedocs/changelog.html @@ -141,6 +141,27 @@ hr {
+

4.4.4 -- 2021-11-01

+ +

Bug +

+
    +
  • [SMACK-916] - XMPPErrorException.stanza is missing a getter method +
  • +
  • [SMACK-915] - Smack does not process MUC destroy message if they contain 'status' +
  • +
  • [SMACK-914] - MultiUserChat may be become unjoinable due to a race condition +
  • +
  • [SMACK-913] - MultiUserChat.serviceSupportsStableIds\(\) may throws a NullPointerException +
  • +
  • [SMACK-912] - Smack does not start the local SOCKS5 proxy automatically +
  • +
  • [SMACK-910] - FormNode and FormNodeProvide should handle non-existent DataForm +
  • +
  • [SMACK-909] - Must use the raw character data of a form field in entity caps hash calculation +
  • +
+

4.4.3 -- 2021-07-06

Bug diff --git a/version b/version index fb1df371a..cbe06cdbf 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.4.4-SNAPSHOT +4.4.4