From 81519eb703309e73bba9f7c249accd552c409403 Mon Sep 17 00:00:00 2001 From: Simon Johnson <2924684+simon622@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:58:56 +0100 Subject: [PATCH] Release 2023.6 --- README.adoc | 2 +- ext/release-process.txt | 6 +++--- gradle.properties | 2 +- hivemq-edge/gradle.properties | 4 ++-- .../src/main/java/com/hivemq/edge/HiveMQEdgeConstants.java | 2 +- .../src/main/resources/hivemq-edge-configuration.json | 6 +++--- modules/hivemq-edge-module-http/gradle.properties | 2 +- modules/hivemq-edge-module-modbus/gradle.properties | 2 +- modules/hivemq-edge-module-opcua/gradle.properties | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.adoc b/README.adoc index a7553f9fb2..0b381ff2d3 100644 --- a/README.adoc +++ b/README.adoc @@ -83,7 +83,7 @@ The ideal place for questions or discussions about the HiveMQ Edge Edition is ou === Quick Start -* Download the latest https://github.com/hivemq/hivemq-edge/releases/download/2023.5/hivemq-edge-2023.5.zip[HiveMQ Edge binary package]. +* Download the latest https://github.com/hivemq/hivemq-edge/releases/download/2023.6/hivemq-edge-2023.6.zip[HiveMQ Edge binary package]. * Unzip the package. * Run the run.sh (Linux/OSX) or run.bat (Windows) in the bin folder of the package. diff --git a/ext/release-process.txt b/ext/release-process.txt index a04d34c621..d9f757c189 100644 --- a/ext/release-process.txt +++ b/ext/release-process.txt @@ -1,15 +1,15 @@ Step 1 - Ensure all PRs are merged to master (or release branch) and all tickets are Done Step 2 - Ensure you checkout the release branch locally (master for now) and pull Step 3 - Ensure you dev environment is clean -Step 4 - Run hivemq-edge/hivemq-edge/src/test functional tests - - if <> green follow test failure procedure. +Step 4 - Run hivemq-edge/hivemq-edge/src/test functional tests - - if <> green follow test failure procedure. - This process will take approximately 1-2 minutes Step 5 - Ensure hivemq-edge-test/ is up to date and run integration test suite - This process will take approximately 18-19 minutes - if <> green follow test failure procedure Step 6 - Update "version" property in hivemq-edge/gradle.properties Step 7 - Update "version" property in hivemq-edge/hivemq-edge/gradle.properties Step 8 - Update "hivemq-edge-extension-sdk.version" property in hivemq-edge/hivemq-edge/gradle.properties Step 9 - Update "version" property in ~all hivemq-edge/modules/${moduleName}/gradle.properties Step 10 - Update "version" property in hivemq-edge-composite/gradle.properties -Step 11 - Update "version" property in hivemq-edge-extension-sdk/gradle.properties -Step 12 - Update "hivemq-edge-extension-sdk.version" property in hivemq-edge-composite/gradle.properties +!!!!! Step 11 - Update "hivemq-edge-extension-sdk.version" property in hivemq-edge-composite/gradle.properties +Step 12 - Update "version" property in hivemq-edge-extension-sdk/gradle.properties Step 13(a) - Update VERSION field in HiveMQEdgeConstants (this is where the module versions are derived - for now) Step 13(b) - Ensure any ~new protocol adapter definitions are added to the "modules" array hivemq-edge/src/resources/hivemq-edge-configuration.json remote config file Step 13(c) - Update all the "version" attributes in each of the objects in the "modules" array in the hivemq-edge/src/resources/hivemq-edge-configuration.json file (this surfaces these modules up to legacy installations) diff --git a/gradle.properties b/gradle.properties index 27f613a94b..59056f5f2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2023.5 +version=2023.6 # Enable build cache. org.gradle.caching=true diff --git a/hivemq-edge/gradle.properties b/hivemq-edge/gradle.properties index 4f3d014ed8..d2dcdd286f 100644 --- a/hivemq-edge/gradle.properties +++ b/hivemq-edge/gradle.properties @@ -1,9 +1,9 @@ -version=2023.5 +version=2023.6 # # main dependencies # hivemq-extension-sdk.version=4.16.0 -hivemq-edge-extension-sdk.version=2023.5 +hivemq-edge-extension-sdk.version=2023.6 # netty netty.version=4.1.79.Final # Jersey (JAXRS / Sun) diff --git a/hivemq-edge/src/main/java/com/hivemq/edge/HiveMQEdgeConstants.java b/hivemq-edge/src/main/java/com/hivemq/edge/HiveMQEdgeConstants.java index 0fd28666fd..fef2ed5db2 100644 --- a/hivemq-edge/src/main/java/com/hivemq/edge/HiveMQEdgeConstants.java +++ b/hivemq-edge/src/main/java/com/hivemq/edge/HiveMQEdgeConstants.java @@ -21,7 +21,7 @@ public interface HiveMQEdgeConstants { //TODO this should be build driven for modules but use single constant for now - String VERSION = "2023.5"; + String VERSION = "2023.6"; String DEVELOPMENT_MODE = "hivemq.edge.workspace.modules"; String CONFIG_FILE_NAME = "hivemq.edge.config.xml"; String MUTABLE_CONFIGURAION_ENABLED = "mutable.configuration.enabled"; diff --git a/hivemq-edge/src/main/resources/hivemq-edge-configuration.json b/hivemq-edge/src/main/resources/hivemq-edge-configuration.json index a18a3d3f62..526a47058f 100644 --- a/hivemq-edge/src/main/resources/hivemq-edge-configuration.json +++ b/hivemq-edge/src/main/resources/hivemq-edge-configuration.json @@ -38,7 +38,7 @@ "modules" : [ { "id" : "modbus", - "version" : "2023.5", + "version" : "2023.6", "name" : "Modbus to MQTT Protocol Adapter", "description" : "Connects HiveMQ Edge to existing Modbus devices, bringing data from coils & registers into MQTT.", "author" : "HiveMQ", @@ -57,7 +57,7 @@ }, { "id" : "opc-ua-client", - "version" : "2023.5", + "version" : "2023.6", "name" : "OPC-UA to MQTT Protocol Adapter", "description" : "Connects HiveMQ Edge to existing OPC-UA services as a client and enables a seamless exchange of data between MQTT and OPC-UA.", "author" : "HiveMQ", @@ -76,7 +76,7 @@ }, { "id" : "http", - "version" : "2023.5 (BETA)", + "version" : "2023.6 (BETA)", "name" : "HTTP(s) to MQTT Protocol Adapter", "description" : "Connects HiveMQ Edge to arbitrary web endpoint URLs via HTTP(s), consuming structured JSON or plain data.", "author" : "HiveMQ", diff --git a/modules/hivemq-edge-module-http/gradle.properties b/modules/hivemq-edge-module-http/gradle.properties index fdb475d795..0d44966124 100644 --- a/modules/hivemq-edge-module-http/gradle.properties +++ b/modules/hivemq-edge-module-http/gradle.properties @@ -1,4 +1,4 @@ -version=2023.5 +version=2023.6 # # main dependencies # diff --git a/modules/hivemq-edge-module-modbus/gradle.properties b/modules/hivemq-edge-module-modbus/gradle.properties index 7d14dd970a..f519555a69 100644 --- a/modules/hivemq-edge-module-modbus/gradle.properties +++ b/modules/hivemq-edge-module-modbus/gradle.properties @@ -1,4 +1,4 @@ -version=2023.5 +version=2023.6 # # main dependencies # diff --git a/modules/hivemq-edge-module-opcua/gradle.properties b/modules/hivemq-edge-module-opcua/gradle.properties index c07515aaec..52969d518a 100644 --- a/modules/hivemq-edge-module-opcua/gradle.properties +++ b/modules/hivemq-edge-module-opcua/gradle.properties @@ -1,4 +1,4 @@ -version=2023.5 +version=2023.6 # # main dependencies #