Merge branch 'develop/3.6' of github.com:thingsboard/thingsboard into feature/java-17

2023-05-19 19:06:45 +02:00 · 2023-05-19 19:06:45 +02:00 · f2545fb942
commit f2545fb942
parent bba26ca676 b5bce3e187
57 changed files with 58 additions and 62 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.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>application</artifactId>
--- 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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- 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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
@ -92,10 +92,6 @@
            <groupId>com.github.oshi</groupId>
            <artifactId>oshi-core</artifactId>
        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
    </dependencies>

    <build>
--- 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.1-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.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>dao</artifactId>
--- 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.1-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.1-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.1",
+  "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.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
--- 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.1-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.1-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.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>msa</artifactId>
    </parent>
    <groupId>org.thingsboard.msa</groupId>
--- 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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1",
+  "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.1-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.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <artifactId>netty-mqtt</artifactId>
-    <version>3.5.1-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.1-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.1-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.1-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.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>rule-engine</artifactId>
    </parent>
    <groupId>org.thingsboard.rule-engine</groupId>
--- 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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1-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.1",
+  "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.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>