From 56757df5125f17510c516024087f456dc9aa9e25 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Wed, 17 Apr 2019 17:30:09 +0100 Subject: [PATCH] Bump version and changelog details. --- CMakeLists.txt | 2 +- ChangeLog.txt | 33 +++++++++++++++++++-------------- config.mk | 2 +- installer/mosquitto.nsi | 2 +- installer/mosquitto64.nsi | 2 +- lib/mosquitto.h | 4 ++-- set-version.sh | 4 ++-- snap/snapcraft.yaml | 2 +- test/Makefile | 1 + 9 files changed, 29 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47d83558..183100a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project(mosquitto) cmake_minimum_required(VERSION 2.8) # Only for version 3 and up. cmake_policy(SET CMP0042 NEW) -set (VERSION 1.5.90) +set (VERSION 1.6.0) add_definitions (-DCMAKE -DVERSION=\"${VERSION}\") diff --git a/ChangeLog.txt b/ChangeLog.txt index f58a4903..a83ba2fd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,39 +1,46 @@ -1.6 - 2018xxxx +1.6 - 20190417 ============== Broker features: -- Improved general support for broker generated client ids. Removed libuuid - dependency. -- auto_id_prefix now defaults to 'auto-'. +- Add support for MQTT v5 +- Add support for OCSP stapling. +- Add support for ALPN on bridge TLS connections. Closes #924. +- Add support for Automotive DLT logging. +- Add TLS Engine support. +- Persistence file read/write performance improvements. - Add max_keepalive option, to allow a maximum keepalive value to be set for MQTT v5 clients only. -- Add TLS Engine support. - Add `bind_interface` option which allows a listener to be bound to a specific network interface, in a similar fashion to the `bind_address` option. Linux only. - Add improved bridge restart interval based on Decorrelated Jitter. - Add `dhparamfile` option, to allow DH parameters to be loaded for Ephemeral DH support -- Add explicit support for TLS v1.3. -- Drop support for TLS v1.0. -- Add support for Automotive DLT logging. - Disallow writing to $ topics where appropriate. - Fix mosquitto_passwd crashing on corrupt password file. Closes #1207. -- Add support for OCSP stapling. -- Add support for ALPN on bridge TLS connections. Closes #924. +- Add explicit support for TLS v1.3. +- Drop support for TLS v1.0. +- Improved general support for broker generated client ids. Removed libuuid + dependency. +- auto_id_prefix now defaults to 'auto-'. +- QoS 1 and 2 flow control improvements. Client library features: +- Add support for MQTT v5 - Add mosquitto_subscribe_multiple() for sending subscriptions to multiple topics in one command. - Add TLS Engine support. - Add explicit support for TLS v1.3. - Drop support for TLS v1.0. -- Add support for OCSP stapling to bridges. -- Add support for ALPN on TLS connections. Closes #924. +- QoS 1 and 2 flow control improvements. Client features: +- Add support for MQTT v5 - Add mosquitto_rr client, which can be used for "request-response" messaging, by sending a request message and awaiting a response. +- Add TLS Engine support. +- Add support for ALPN on TLS connections. Closes #924. +- Add -D option for all clients to specify MQTT v5 properties. - Add -E to mosquitto_sub, which causes it to exit immediately after having its subscriptions acknowledged. Use with -c to create a durable client session without requiring a message to be received. @@ -42,8 +49,6 @@ Client features: - Add --repeat and --repeat-delay to mosquitto_pub, which can be used to repeat single message publishes at a regular interval. - -V now accepts `5, `311`, `31`, as well as `mqttv5` etc. -- Add TLS Engine support. -- Add support for ALPN on TLS connections. Closes #924. - Add explicit support for TLS v1.3. - Drop support for TLS v1.0. diff --git a/config.mk b/config.mk index 1a59a233..ad2f1333 100644 --- a/config.mk +++ b/config.mk @@ -104,7 +104,7 @@ WITH_COVERAGE:=no # Also bump lib/mosquitto.h, CMakeLists.txt, # installer/mosquitto.nsi, installer/mosquitto64.nsi -VERSION=1.5.90 +VERSION=1.6.0 # Client library SO version. Bump if incompatible API/ABI changes are made. SOVERSION=1 diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi index bf016402..ecd0cd0b 100644 --- a/installer/mosquitto.nsi +++ b/installer/mosquitto.nsi @@ -9,7 +9,7 @@ !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' Name "Eclipse Mosquitto" -!define VERSION 1.5.90 +!define VERSION 1.6.0 OutFile "mosquitto-${VERSION}-install-windows-x86.exe" InstallDir "$PROGRAMFILES\mosquitto" diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi index 2dc7b4e6..7856cf56 100644 --- a/installer/mosquitto64.nsi +++ b/installer/mosquitto64.nsi @@ -9,7 +9,7 @@ !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' Name "Eclipse Mosquitto" -!define VERSION 1.5.90 +!define VERSION 1.6.0 OutFile "mosquitto-${VERSION}-install-windows-x64.exe" !include "x64.nsh" diff --git a/lib/mosquitto.h b/lib/mosquitto.h index 79ca8d86..7e82877f 100644 --- a/lib/mosquitto.h +++ b/lib/mosquitto.h @@ -47,8 +47,8 @@ extern "C" { #include #define LIBMOSQUITTO_MAJOR 1 -#define LIBMOSQUITTO_MINOR 5 -#define LIBMOSQUITTO_REVISION 90 +#define LIBMOSQUITTO_MINOR 6 +#define LIBMOSQUITTO_REVISION 0 /* LIBMOSQUITTO_VERSION_NUMBER looks like 1002001 for e.g. version 1.2.1. */ #define LIBMOSQUITTO_VERSION_NUMBER (LIBMOSQUITTO_MAJOR*1000000+LIBMOSQUITTO_MINOR*1000+LIBMOSQUITTO_REVISION) diff --git a/set-version.sh b/set-version.sh index 5cb46a3c..a45ab7e6 100755 --- a/set-version.sh +++ b/set-version.sh @@ -1,8 +1,8 @@ #!/bin/sh MAJOR=1 -MINOR=5 -REVISION=90 +MINOR=6 +REVISION=0 sed -i "s/^VERSION=.*/VERSION=${MAJOR}.${MINOR}.${REVISION}/" config.mk diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index dced140b..5a38ca4d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: mosquitto -version: 1.5.90 +version: 1.6.0 summary: Eclipse Mosquitto MQTT broker description: This is a message broker that supports version 3.1 and 3.1.1 of the MQTT protocol. diff --git a/test/Makefile b/test/Makefile index e8fab366..571ea3e4 100644 --- a/test/Makefile +++ b/test/Makefile @@ -15,6 +15,7 @@ ptest : utest utest : $(MAKE) -C unit test +reallyclean : clean clean : $(MAKE) -C lib clean $(MAKE) -C broker clean