Switch to version 3.6.0

3 years ago · 98c245e293
65 changed files with 87 additions and 87 deletions
--- a/application/pom.xml
+++ b/application/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>application</artifactId>
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
@ -455,7 +455,7 @@ class DefaultTbContext implements TbContext {
        return entityActionMsg(entity, id, ruleNodeId, actionMsgType, null);
    }

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    public <E, I extends EntityId, K extends HasRuleEngineProfile> TbMsg entityActionMsg(E entity, I id, RuleNodeId ruleNodeId, String action, K profile) {
        try {
            return entityActionMsg(id, getActionMetaData(ruleNodeId), JacksonUtil.toString(JacksonUtil.valueToTree(entity)), action, profile);
@ -464,7 +464,7 @@ class DefaultTbContext implements TbContext {
        }
    }

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    private <I extends EntityId, K extends HasRuleEngineProfile> TbMsg entityActionMsg(I id, TbMsgMetaData msgMetaData, String msgData, String action, K profile) {
        String defaultQueueName = null;
        RuleChainId defaultRuleChainId = null;
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@ -258,7 +258,7 @@ public class ThingsboardInstallService {
                            log.info("Upgrading ThingsBoard from version 3.5.0 to 3.5.1 ...");
                            databaseEntitiesUpgradeService.upgradeDatabase("3.5.0");
                        case "3.5.1":
-                            log.info("Upgrading ThingsBoard from version 3.5.1 to 3.5.2 ...");
+                            log.info("Upgrading ThingsBoard from version 3.5.1 to 3.6.0 ...");
                            databaseEntitiesUpgradeService.upgradeDatabase("3.5.1");
                            dataUpdateService.updateData("3.5.1");
                            systemDataLoaderService.updateDefaultNotificationConfigs();
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
@ -206,7 +206,7 @@ public class DefaultDataUpdateService implements DataUpdateService {
                migrateEdgeEvents("Starting edge events migration. ");
                break;
            case "3.5.1":
-                log.info("Updating data from version 3.5.1 to 3.5.2 ...");
+                log.info("Updating data from version 3.5.1 to 3.6.0 ...");
                migrateEdgeEvents("Starting edge events migration - adding seq_id column. ");
                break;
            default:
--- a/common/actor/pom.xml
+++ b/common/actor/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/cache/pom.xml
+++ b/common/cache/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/cluster-api/pom.xml
+++ b/common/cluster-api/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/coap-server/pom.xml
+++ b/common/coap-server/pom.xml
@ -22,7 +22,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/dao-api/pom.xml
+++ b/common/dao-api/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/edge-api/pom.xml
+++ b/common/edge-api/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/message/pom.xml
+++ b/common/message/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
@ -73,7 +73,7 @@ public final class TbMsg implements Serializable {
        return ctx.getAndIncrementRuleNodeCounter();
    }

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    public static TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
        return newMsg(queueName, type, originator, null, metaData, data, ruleChainId, ruleNodeId);
    }
@ -81,7 +81,7 @@ public final class TbMsg implements Serializable {
    /**
     * Creates a new TbMsg instance with the specified parameters.
     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.5.2 and should only be used when you need to
+     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
     * it is recommended to use the {@link #newMsg(String, TbMsgType, EntityId, CustomerId, TbMsgMetaData, String, RuleChainId, RuleNodeId)}
     * method instead.</p>
@ -96,18 +96,18 @@ public final class TbMsg implements Serializable {
     * @param ruleNodeId  the ID of the rule node associated with the message
     * @return new TbMsg instance
     */
-    @Deprecated(since = "3.5.2")
+    @Deprecated(since = "3.6.0")
    public static TbMsg newMsg(String queueName, String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
        return new TbMsg(queueName, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, customerId,
                metaData.copy(), TbMsgDataType.JSON, data, ruleChainId, ruleNodeId, null, TbMsgCallback.EMPTY);
    }

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data) {
        return newMsg(type, originator, null, metaData, data);
    }

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    public static TbMsg newMsg(String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data) {
        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, customerId,
                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, TbMsgCallback.EMPTY);
@ -136,7 +136,7 @@ public final class TbMsg implements Serializable {
    /**
     * Creates a new TbMsg instance with the specified parameters.
     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.5.2 and should only be used when you need to
+     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
     * it is recommended to use the {@link #newMsg(String, TbMsgType, EntityId, TbMsgMetaData, String)}
     * method instead.</p>
@ -148,7 +148,7 @@ public final class TbMsg implements Serializable {
     * @param data        the data of the message
     * @return new TbMsg instance
     */
-    @Deprecated(since = "3.5.2")
+    @Deprecated(since = "3.6.0")
    public static TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data) {
        return newMsg(queueName, type, originator, null, metaData, data);
    }
@ -156,7 +156,7 @@ public final class TbMsg implements Serializable {
    /**
     * Creates a new TbMsg instance with the specified parameters.
     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.5.2 and should only be used when you need to
+     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
     * it is recommended to use the {@link #newMsg(String, TbMsgType, EntityId, CustomerId, TbMsgMetaData, String)}
     * method instead.</p>
@ -169,13 +169,13 @@ public final class TbMsg implements Serializable {
     * @param data        the data of the message
     * @return new TbMsg instance
     */
-    @Deprecated(since = "3.5.2")
+    @Deprecated(since = "3.6.0")
    public static TbMsg newMsg(String queueName, String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data) {
        return new TbMsg(queueName, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, customerId,
                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, TbMsgCallback.EMPTY);
    }

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    public static TbMsg newMsg(String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, TbMsgDataType dataType, String data) {
        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, customerId,
                metaData.copy(), dataType, data, null, null, null, TbMsgCallback.EMPTY);
@ -184,7 +184,7 @@ public final class TbMsg implements Serializable {
    /**
     * Creates a new TbMsg instance with the specified parameters.
     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.5.2 and should only be used when you need to
+     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
     * it is recommended to use the {@link #newMsg(TbMsgType, EntityId, TbMsgMetaData, TbMsgDataType, String)}
     * method instead.</p>
@ -196,7 +196,7 @@ public final class TbMsg implements Serializable {
     * @param data        the data of the message
     * @return new TbMsg instance
     */
-    @Deprecated(since = "3.5.2")
+    @Deprecated(since = "3.6.0")
    public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data) {
        return newMsg(type, originator, null, metaData, dataType, data);
    }
@ -221,13 +221,13 @@ public final class TbMsg implements Serializable {

    // For Tests only

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, TbMsgDataType dataType, String data, RuleChainId ruleChainId, RuleNodeId ruleNodeId) {
        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, null,
                metaData.copy(), dataType, data, ruleChainId, ruleNodeId, null, TbMsgCallback.EMPTY);
    }

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    public static TbMsg newMsg(String type, EntityId originator, TbMsgMetaData metaData, String data, TbMsgCallback callback) {
        return new TbMsg(null, UUID.randomUUID(), System.currentTimeMillis(), null, type, originator, null,
                metaData.copy(), TbMsgDataType.JSON, data, null, null, null, callback);
@ -236,7 +236,7 @@ public final class TbMsg implements Serializable {
    /**
     * Transforms an existing TbMsg instance by changing its message type, originator, metadata, and data.
     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.5.2 and should only be used when you need to
+     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
     * it is recommended to use the {@link #transformMsg(TbMsg, TbMsgType, EntityId, TbMsgMetaData, String)}
     * method instead.</p>
@ -249,7 +249,7 @@ public final class TbMsg implements Serializable {
     * @param data       the new data
     * @return the transformed TbMsg instance
     */
-    @Deprecated(since = "3.5.2")
+    @Deprecated(since = "3.6.0")
    public static TbMsg transformMsg(TbMsg tbMsg, String type, EntityId originator, TbMsgMetaData metaData, String data) {
        return new TbMsg(tbMsg.queueName, tbMsg.id, tbMsg.ts, null, type, originator, tbMsg.customerId, metaData.copy(), tbMsg.dataType,
                data, tbMsg.ruleChainId, tbMsg.ruleNodeId, tbMsg.ctx.copy(), tbMsg.callback);
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/session/SessionMsgType.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/session/SessionMsgType.java
@ -20,7 +20,7 @@ package org.thingsboard.server.common.msg.session;
 * Note: This enum was originally part of the public API but is now specific to CoAP transport only.
 * Please use {@link org.thingsboard.server.transport.coap.CoapSessionMsgType} instead.
 */
-@Deprecated(since="3.5.2", forRemoval = true)
+@Deprecated(since="3.6.0", forRemoval = true)
 public enum SessionMsgType {
    GET_ATTRIBUTES_REQUEST(true), POST_ATTRIBUTES_REQUEST(true), GET_ATTRIBUTES_RESPONSE,
    SUBSCRIBE_ATTRIBUTES_REQUEST, UNSUBSCRIBE_ATTRIBUTES_REQUEST, ATTRIBUTES_UPDATE_NOTIFICATION,
--- a/common/pom.xml
+++ b/common/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>common</artifactId>
--- a/common/queue/pom.xml
+++ b/common/queue/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/script/pom.xml
+++ b/common/script/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/script/remote-js-client/pom.xml
+++ b/common/script/remote-js-client/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.common</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>script</artifactId>
    </parent>
    <groupId>org.thingsboard.common.script</groupId>
--- a/common/script/script-api/pom.xml
+++ b/common/script/script-api/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.common</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>script</artifactId>
    </parent>
    <groupId>org.thingsboard.common.script</groupId>
--- a/common/stats/pom.xml
+++ b/common/stats/pom.xml
@ -22,7 +22,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/transport/coap/pom.xml
+++ b/common/transport/coap/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.common</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.common.transport</groupId>
--- a/common/transport/http/pom.xml
+++ b/common/transport/http/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.common</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.common.transport</groupId>
--- a/common/transport/lwm2m/pom.xml
+++ b/common/transport/lwm2m/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.common</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.common.transport</groupId>
--- a/common/transport/mqtt/pom.xml
+++ b/common/transport/mqtt/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.common</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.common.transport</groupId>
--- a/common/transport/pom.xml
+++ b/common/transport/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/transport/snmp/pom.xml
+++ b/common/transport/snmp/pom.xml
@ -21,7 +21,7 @@

    <parent>
        <groupId>org.thingsboard.common</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>

--- a/common/transport/transport-api/pom.xml
+++ b/common/transport/transport-api/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.common</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.common.transport</groupId>
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/version-control/pom.xml
+++ b/common/version-control/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/dao/pom.xml
+++ b/dao/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>dao</artifactId>
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java
@ -82,7 +82,7 @@ public class JpaNotificationDao extends JpaAbstractDao<NotificationEntity, Notif
    }

    /**
-     * For this hot method, the partial index `idx_notification_recipient_id_unread` was introduced since 3.5.2
+     * For this hot method, the partial index `idx_notification_recipient_id_unread` was introduced since 3.6.0
     * */
    @Override
    public int countUnreadByRecipientId(TenantId tenantId, UserId recipientId) {
--- a/monitoring/pom.xml
+++ b/monitoring/pom.xml
@ -21,7 +21,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>

--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@ -21,7 +21,7 @@

    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
--- a/msa/js-executor/package.json
+++ b/msa/js-executor/package.json
@ -1,7 +1,7 @@
 {
  "name": "thingsboard-js-executor",
  "private": true,
-  "version": "3.5.2",
+  "version": "3.6.0",
  "description": "ThingsBoard JavaScript Executor Microservice",
  "main": "server.ts",
  "bin": "server.js",
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
--- a/msa/monitoring/pom.xml
+++ b/msa/monitoring/pom.xml
@ -22,7 +22,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>

--- a/msa/pom.xml
+++ b/msa/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>msa</artifactId>
--- a/msa/tb-node/pom.xml
+++ b/msa/tb-node/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
--- a/msa/tb/pom.xml
+++ b/msa/tb/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
@ -38,7 +38,7 @@
        <tb-postgres.docker.name>tb-postgres</tb-postgres.docker.name>
        <tb-cassandra.docker.name>tb-cassandra</tb-cassandra.docker.name>
        <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
-        <pkg.upgradeVersion>3.5.2</pkg.upgradeVersion>
+        <pkg.upgradeVersion>3.6.0</pkg.upgradeVersion>
    </properties>

    <dependencies>
--- a/msa/transport/coap/pom.xml
+++ b/msa/transport/coap/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.msa</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.msa.transport</groupId>
--- a/msa/transport/http/pom.xml
+++ b/msa/transport/http/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.msa</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.msa.transport</groupId>
--- a/msa/transport/lwm2m/pom.xml
+++ b/msa/transport/lwm2m/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.msa</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.msa.transport</groupId>
--- a/msa/transport/mqtt/pom.xml
+++ b/msa/transport/mqtt/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard.msa</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.msa.transport</groupId>
--- a/msa/transport/pom.xml
+++ b/msa/transport/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
--- a/msa/transport/snmp/pom.xml
+++ b/msa/transport/snmp/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.thingsboard.msa</groupId>
        <artifactId>transport</artifactId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
    </parent>

    <groupId>org.thingsboard.msa.transport</groupId>
--- a/msa/vc-executor-docker/pom.xml
+++ b/msa/vc-executor-docker/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
--- a/msa/vc-executor/pom.xml
+++ b/msa/vc-executor/pom.xml
@ -21,7 +21,7 @@

    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
--- a/msa/web-ui/package.json
+++ b/msa/web-ui/package.json
@ -1,7 +1,7 @@
 {
  "name": "thingsboard-web-ui",
  "private": true,
-  "version": "3.5.2",
+  "version": "3.6.0",
  "description": "ThingsBoard Web UI Microservice",
  "main": "server.ts",
  "bin": "server.js",
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
--- a/netty-mqtt/pom.xml
+++ b/netty-mqtt/pom.xml
@ -19,11 +19,11 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>netty-mqtt</artifactId>
-    <version>3.5.2-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
    <packaging>jar</packaging>

    <name>Netty MQTT Client</name>
--- a/pom.xml
+++ b/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.thingsboard</groupId>
    <artifactId>thingsboard</artifactId>
-    <version>3.5.2-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
    <packaging>pom</packaging>

    <name>Thingsboard</name>
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>rest-client</artifactId>
--- a/rule-engine/pom.xml
+++ b/rule-engine/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>rule-engine</artifactId>
--- a/rule-engine/rule-engine-api/pom.xml
+++ b/rule-engine/rule-engine-api/pom.xml
@ -22,7 +22,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>rule-engine</artifactId>
    </parent>
    <groupId>org.thingsboard.rule-engine</groupId>
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
@ -184,13 +184,13 @@ public interface TbContext {

    void ack(TbMsg tbMsg);

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    TbMsg newMsg(String queueName, String type, EntityId originator, TbMsgMetaData metaData, String data);

    /**
     * Creates a new TbMsg instance with the specified parameters.
     *
-     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.5.2 and should only be used when you need to
+     * <p><strong>Deprecated:</strong> This method is deprecated since version 3.6.0 and should only be used when you need to
     * specify a custom message type that doesn't exist in the {@link TbMsgType} enum. For standard message types,
     * it is recommended to use the {@link #newMsg(String, TbMsgType, EntityId, CustomerId, TbMsgMetaData, String)}
     * method instead.</p>
@ -203,10 +203,10 @@ public interface TbContext {
     * @param data        the data of the message
     * @return new TbMsg instance
     */
-    @Deprecated(since = "3.5.2")
+    @Deprecated(since = "3.6.0")
    TbMsg newMsg(String queueName, String type, EntityId originator, CustomerId customerId, TbMsgMetaData metaData, String data);

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    TbMsg transformMsg(TbMsg origMsg, String type, EntityId originator, TbMsgMetaData metaData, String data);

    TbMsg newMsg(String queueName, TbMsgType type, EntityId originator, TbMsgMetaData metaData, String data);
@ -225,7 +225,7 @@ public interface TbContext {

    TbMsg assetCreatedMsg(Asset asset, RuleNodeId ruleNodeId);

-    @Deprecated(since = "3.5.2", forRemoval = true)
+    @Deprecated(since = "3.6.0", forRemoval = true)
    TbMsg alarmActionMsg(Alarm alarm, RuleNodeId ruleNodeId, String action);

    TbMsg alarmActionMsg(Alarm alarm, RuleNodeId ruleNodeId, TbMsgType actionMsgType);
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@ -22,7 +22,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>rule-engine</artifactId>
    </parent>
    <groupId>org.thingsboard.rule-engine</groupId>
--- a/tools/pom.xml
+++ b/tools/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>tools</artifactId>
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- a/transport/lwm2m/pom.xml
+++ b/transport/lwm2m/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- a/transport/pom.xml
+++ b/transport/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>transport</artifactId>
--- a/transport/snmp/pom.xml
+++ b/transport/snmp/pom.xml
@ -21,7 +21,7 @@

    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>

--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@ -1,6 +1,6 @@
 {
  "name": "thingsboard",
-  "version": "3.5.2",
+  "version": "3.6.0",
  "scripts": {
    "ng": "ng",
    "start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --configuration development --host 0.0.0.0 --open",
--- a/ui-ngx/pom.xml
+++ b/ui-ngx/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>3.5.2-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>