Version set to 3.3.0-SNAPSHOT. Code style improvements.

Igor Kulikov
1 parent 65505209
Showing 44 changed files with 90 additions and 111 deletions
application/pom.xml
common/actor/pom.xml
common/dao-api/pom.xml
common/data/pom.xml
common/message/pom.xml
common/pom.xml
common/queue/pom.xml
common/stats/pom.xml
common/transport/coap/pom.xml
common/transport/http/pom.xml
common/transport/lwm2m/pom.xml
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
common/transport/mqtt/pom.xml
common/transport/pom.xml
common/transport/transport-api/pom.xml
common/util/pom.xml
common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
dao/pom.xml
msa/black-box-tests/pom.xml
--- a/application/pom.xml
View file @8fe6c95
+++ b/application/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>application</artifactId>
--- a/common/actor/pom.xml
View file @8fe6c95
+++ b/common/actor/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
--- a/common/dao-api/pom.xml
View file @8fe6c95
+++ b/common/dao-api/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
--- a/common/data/pom.xml
View file @8fe6c95
+++ b/common/data/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
--- a/common/message/pom.xml
View file @8fe6c95
+++ b/common/message/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
--- a/common/pom.xml
View file @8fe6c95
+++ b/common/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>common</artifactId>
--- a/common/queue/pom.xml
View file @8fe6c95
+++ b/common/queue/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
--- a/common/stats/pom.xml
View file @8fe6c95
+++ b/common/stats/pom.xml
View file @8fe6c95
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
--- a/common/transport/coap/pom.xml
View file @8fe6c95
+++ b/common/transport/coap/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
--- a/common/transport/http/pom.xml
View file @8fe6c95
+++ b/common/transport/http/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
--- a/common/transport/lwm2m/pom.xml
View file @8fe6c95
+++ b/common/transport/lwm2m/pom.xml
View file @8fe6c95
@@ -15,24 +15,6 @@
     limitations under the License.
 -->
-
-<!--
-
-    Copyright © 2016-2020 The Thingsboard Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
View file @8fe6c95
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
View file @8fe6c95
@@ -38,6 +38,7 @@ import org.eclipse.leshan.server.californium.LeshanServer;
 import org.eclipse.leshan.server.registration.Registration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.transport.TransportService;
@@ -470,10 +471,8 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
             // #3
             else {
                 lwM2MClient.getPendingRequests().addAll(clientObjects);
-                clientObjects.forEach(path -> {
-                    lwM2mTransportRequest.sendAllRequest(registration, path, GET_TYPE_OPER_READ, ContentFormat.TLV.getName(),
-                            null, null, this.lwM2mTransportContextServer.getLwM2MTransportConfigServer().getTimeout());
-                });
+                clientObjects.forEach(path -> lwM2mTransportRequest.sendAllRequest(registration, path, GET_TYPE_OPER_READ, ContentFormat.TLV.getName(),
+                        null, null, this.lwM2mTransportContextServer.getLwM2MTransportConfigServer().getTimeout()));
             }
         }
         // #1
@@ -589,38 +588,29 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
      * @param registration -
      */
     private void initReadAttrTelemetryObserveToClient(Registration registration, LwM2mClient lwM2MClient, String typeOper) {
-        try {
-            LwM2mClientProfile lwM2MClientProfile = lwM2mClientContext.getProfile(registration);
-            Set<String> clientInstances = this.getAllInstancesInClient(registration);
-            Set<String> result;
-            if (GET_TYPE_OPER_READ.equals(typeOper)) {
-                result = new ObjectMapper().readValue(lwM2MClientProfile.getPostAttributeProfile().getAsJsonArray().toString().getBytes(), new TypeReference<>() {
-                });
-                result.addAll(new ObjectMapper().readValue(lwM2MClientProfile.getPostTelemetryProfile().getAsJsonArray().toString().getBytes(), new TypeReference<>() {
-                }));
-            } else {
-                result = new ObjectMapper().readValue(lwM2MClientProfile.getPostObserveProfile().getAsJsonArray().toString().getBytes(), new TypeReference<>() {
-                });
-            }
-            Set<String> pathSent = ConcurrentHashMap.newKeySet();
-            result.forEach(target -> {
-                // #1.1
-                String[] resPath = target.split("/");
-                String instance = "/" + resPath[1] + "/" + resPath[2];
-                if (clientInstances != null && clientInstances.size() > 0 && clientInstances.contains(instance)) {
-                    pathSent.add(target);
-                }
-            });
-            lwM2MClient.getPendingRequests().addAll(pathSent);
-            pathSent.forEach(target -> {
-                lwM2mTransportRequest.sendAllRequest(registration, target, typeOper, ContentFormat.TLV.getName(),
-                        null, null, this.lwM2mTransportContextServer.getLwM2MTransportConfigServer().getTimeout());
-            });
-            if (GET_TYPE_OPER_OBSERVE.equals(typeOper)) {
-                lwM2MClient.initValue(this, null);
+        LwM2mClientProfile lwM2MClientProfile = lwM2mClientContext.getProfile(registration);
+        Set<String> clientInstances = this.getAllInstancesInClient(registration);
+        Set<String> result;
+        if (GET_TYPE_OPER_READ.equals(typeOper)) {
+            result = JacksonUtil.fromString(lwM2MClientProfile.getPostAttributeProfile().toString(), new TypeReference<>() {});
+            result.addAll(JacksonUtil.fromString(lwM2MClientProfile.getPostTelemetryProfile().toString(), new TypeReference<>() {}));
+        } else {
+            result = JacksonUtil.fromString(lwM2MClientProfile.getPostObserveProfile().toString(), new TypeReference<>() {});
+        }
+        Set<String> pathSent = ConcurrentHashMap.newKeySet();
+        result.forEach(target -> {
+            // #1.1
+            String[] resPath = target.split("/");
+            String instance = "/" + resPath[1] + "/" + resPath[2];
+            if (clientInstances != null && clientInstances.size() > 0 && clientInstances.contains(instance)) {
+                pathSent.add(target);
             }
-        } catch (IOException e) {
-            e.printStackTrace();
+        });
+        lwM2MClient.getPendingRequests().addAll(pathSent);
+        pathSent.forEach(target -> lwM2mTransportRequest.sendAllRequest(registration, target, typeOper, ContentFormat.TLV.getName(),
+                null, null, this.lwM2mTransportContextServer.getLwM2MTransportConfigServer().getTimeout()));
+        if (GET_TYPE_OPER_OBSERVE.equals(typeOper)) {
+            lwM2MClient.initValue(this, null);
         }
     }
@@ -796,9 +786,9 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
         if (lwM2mClientContext.addUpdateProfileParameters(deviceProfile)) {
             // #1
             JsonArray attributeOld = lwM2MClientProfileOld.getPostAttributeProfile();
-            Set attributeSetOld = this.convertJsonArrayToSet (attributeOld);
+            Set<String> attributeSetOld = this.convertJsonArrayToSet (attributeOld);
             JsonArray telemetryOld = lwM2MClientProfileOld.getPostTelemetryProfile();
-            Set telemetrySetOld = this.convertJsonArrayToSet (telemetryOld);
+            Set<String> telemetrySetOld = this.convertJsonArrayToSet (telemetryOld);
             JsonArray observeOld = lwM2MClientProfileOld.getPostObserveProfile();
             JsonObject keyNameOld = lwM2MClientProfileOld.getPostKeyNameProfile();
@@ -806,7 +796,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
             JsonArray attributeNew = lwM2MClientProfileNew.getPostAttributeProfile();
             Set<String> attributeSetNew = this.convertJsonArrayToSet (attributeNew);
             JsonArray telemetryNew = lwM2MClientProfileNew.getPostTelemetryProfile();
-            Set telemetrySetNew =  this.convertJsonArrayToSet (telemetryNew);
+            Set<String> telemetrySetNew =  this.convertJsonArrayToSet (telemetryNew);
             JsonArray observeNew = lwM2MClientProfileNew.getPostObserveProfile();
             JsonObject keyNameNew = lwM2MClientProfileNew.getPostKeyNameProfile();
@@ -1036,7 +1026,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
     private SessionInfoProto getNewSessionInfoProto(LwM2mClient lwM2MClient) {
         if (lwM2MClient != null) {
             TransportProtos.ValidateDeviceCredentialsResponseMsg msg = lwM2MClient.getCredentialsResponse();
-            if (msg == null || msg.getDeviceInfo() == null) {
+            if (msg == null) {
                 log.error("[{}] [{}]", lwM2MClient.getEndpoint(), CLIENT_NOT_AUTHORIZED);
                 this.closeClientSession(lwM2MClient.getRegistration());
                 return null;
@@ -1126,9 +1116,8 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
      */
     private List<String> getNamesAttrFromProfileIsWritable(LwM2mClient lwM2MClient) {
         LwM2mClientProfile profile = lwM2mClientContext.getProfile(lwM2MClient.getProfileId());
-        Set attrSet = new Gson().fromJson(profile.getPostAttributeProfile(), Set.class);
-        ConcurrentMap<String, String> keyNamesMap = new Gson().fromJson(profile.getPostKeyNameProfile().toString(), new TypeToken<ConcurrentHashMap<String, String>>() {
-        }.getType());
+        Set<String> attrSet = new Gson().fromJson(profile.getPostAttributeProfile(), new TypeToken<>() {}.getType());
+        ConcurrentMap<String, String> keyNamesMap = new Gson().fromJson(profile.getPostKeyNameProfile().toString(), new TypeToken<ConcurrentHashMap<String, String>>() {}.getType());
         ConcurrentMap<String, String> keyNamesIsWritable = keyNamesMap.entrySet()
                 .stream()
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
View file @8fe6c95
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
View file @8fe6c95
@@ -21,9 +21,9 @@ import org.eclipse.californium.elements.EndpointContext;
 import org.eclipse.leshan.core.observation.Observation;
 import org.eclipse.leshan.core.util.NamedThreadFactory;
 import org.eclipse.leshan.core.util.Validate;
-import org.eclipse.leshan.server.Destroyable;
-import org.eclipse.leshan.server.Startable;
-import org.eclipse.leshan.server.Stoppable;
+import org.eclipse.leshan.core.Destroyable;
+import org.eclipse.leshan.core.Startable;
+import org.eclipse.leshan.core.Stoppable;
 import org.eclipse.leshan.server.californium.observation.ObserveUtil;
 import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
 import org.eclipse.leshan.server.redis.JedisLock;
@@ -278,8 +278,8 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
     protected class RedisIterator implements Iterator<Registration> {
-        private RedisConnectionFactory connectionFactory;
-        private ScanParams scanParams;
+        private final RedisConnectionFactory connectionFactory;
+        private final ScanParams scanParams;
         private String cursor;
         private List<Registration> scanResult;
@@ -552,17 +552,16 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
     @Override
     public org.eclipse.californium.core.observe.Observation putIfAbsent(Token token,
                                                                         org.eclipse.californium.core.observe.Observation obs) throws ObservationStoreException {
-        return add(token, obs, true);
+        return add(obs, true);
     }
     @Override
     public org.eclipse.californium.core.observe.Observation put(Token token,
                                                                 org.eclipse.californium.core.observe.Observation obs) throws ObservationStoreException {
-        return add(token, obs, false);
+        return add(obs, false);
     }
-    private org.eclipse.californium.core.observe.Observation add(Token token,
-                                                                 org.eclipse.californium.core.observe.Observation obs, boolean ifAbsent) throws ObservationStoreException {
+    private org.eclipse.californium.core.observe.Observation add(org.eclipse.californium.core.observe.Observation obs, boolean ifAbsent) throws ObservationStoreException {
         String endpoint = ObserveUtil.validateCoapObservation(obs);
         org.eclipse.californium.core.observe.Observation previousObservation = null;
@@ -577,7 +576,7 @@ public class TbLwM2mRedisRegistrationStore implements CaliforniumRegistrationSto
                     throw new ObservationStoreException("no registration for this Id");
                 byte[] key = toKey(OBS_TKN, obs.getRequest().getToken().getBytes());
                 byte[] serializeObs = serializeObs(obs);
-                byte[] previousValue = null;
+                byte[] previousValue;
                 if (ifAbsent) {
                     previousValue = j.get(key);
                     if (previousValue == null || previousValue.length == 0) {
--- a/common/transport/mqtt/pom.xml
View file @8fe6c95
+++ b/common/transport/mqtt/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
--- a/common/transport/pom.xml
View file @8fe6c95
+++ b/common/transport/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
--- a/common/transport/transport-api/pom.xml
View file @8fe6c95
+++ b/common/transport/transport-api/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
--- a/common/util/pom.xml
View file @8fe6c95
+++ b/common/util/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
--- a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
View file @8fe6c95
+++ b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
View file @8fe6c95
@@ -57,6 +57,15 @@ public class JacksonUtil {
         }
     }
+    public static <T> T fromString(String string, TypeReference<T> valueTypeRef) {
+        try {
+            return string != null ? OBJECT_MAPPER.readValue(string, valueTypeRef) : null;
+        } catch (IOException e) {
+            throw new IllegalArgumentException("The given string value: "
+                    + string + " cannot be transformed to Json object", e);
+        }
+    }
+
     public static String toString(Object value) {
         try {
             return value != null ? OBJECT_MAPPER.writeValueAsString(value) : null;
--- a/dao/pom.xml
View file @8fe6c95
+++ b/dao/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>dao</artifactId>
--- a/msa/black-box-tests/pom.xml
View file @8fe6c95
+++ b/msa/black-box-tests/pom.xml
View file @8fe6c95
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
--- a/msa/js-executor/package.json
View file @8fe6c95
+++ b/msa/js-executor/package.json
View file @8fe6c95
 {
   "name": "thingsboard-js-executor",
   "private": true,
-  "version": "3.2.2",
+  "version": "3.3.0",
   "description": "ThingsBoard JavaScript Executor Microservice",
   "main": "server.js",
   "bin": "server.js",
--- a/msa/js-executor/pom.xml
View file @8fe6c95
+++ b/msa/js-executor/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
--- a/msa/pom.xml
View file @8fe6c95
+++ b/msa/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>msa</artifactId>
--- a/msa/tb-node/pom.xml
View file @8fe6c95
+++ b/msa/tb-node/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
--- a/msa/tb/pom.xml
View file @8fe6c95
+++ b/msa/tb/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
--- a/msa/transport/coap/pom.xml
View file @8fe6c95
+++ b/msa/transport/coap/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
--- a/msa/transport/http/pom.xml
View file @8fe6c95
+++ b/msa/transport/http/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
--- a/msa/transport/mqtt/pom.xml
View file @8fe6c95
+++ b/msa/transport/mqtt/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
--- a/msa/transport/pom.xml
View file @8fe6c95
+++ b/msa/transport/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
--- a/msa/web-ui/package.json
View file @8fe6c95
+++ b/msa/web-ui/package.json
View file @8fe6c95
 {
   "name": "thingsboard-web-ui",
   "private": true,
-  "version": "3.2.2",
+  "version": "3.3.0",
   "description": "ThingsBoard Web UI Microservice",
   "main": "server.js",
   "bin": "server.js",
--- a/msa/web-ui/pom.xml
View file @8fe6c95
+++ b/msa/web-ui/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
--- a/netty-mqtt/pom.xml
View file @8fe6c95
+++ b/netty-mqtt/pom.xml
View file @8fe6c95
@@ -19,11 +19,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>netty-mqtt</artifactId>
-    <version>3.2.2-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Netty MQTT Client</name>
--- a/pom.xml
View file @8fe6c95
+++ b/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard</groupId>
     <artifactId>thingsboard</artifactId>
-    <version>3.2.2-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Thingsboard</name>
--- a/rest-client/pom.xml
View file @8fe6c95
+++ b/rest-client/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rest-client</artifactId>
--- a/rule-engine/pom.xml
View file @8fe6c95
+++ b/rule-engine/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rule-engine</artifactId>
--- a/rule-engine/rule-engine-api/pom.xml
View file @8fe6c95
+++ b/rule-engine/rule-engine-api/pom.xml
View file @8fe6c95
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>
--- a/rule-engine/rule-engine-components/pom.xml
View file @8fe6c95
+++ b/rule-engine/rule-engine-components/pom.xml
View file @8fe6c95
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>
--- a/tools/pom.xml
View file @8fe6c95
+++ b/tools/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>tools</artifactId>
--- a/transport/coap/pom.xml
View file @8fe6c95
+++ b/transport/coap/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
--- a/transport/http/pom.xml
View file @8fe6c95
+++ b/transport/http/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
--- a/transport/mqtt/pom.xml
View file @8fe6c95
+++ b/transport/mqtt/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
--- a/transport/pom.xml
View file @8fe6c95
+++ b/transport/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>transport</artifactId>
--- a/ui-ngx/package.json
View file @8fe6c95
+++ b/ui-ngx/package.json
View file @8fe6c95
 {
   "name": "thingsboard",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "scripts": {
     "ng": "ng",
     "start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --host 0.0.0.0 --open",
--- a/ui-ngx/pom.xml
View file @8fe6c95
+++ b/ui-ngx/pom.xml
View file @8fe6c95
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>