From 1dc47b5cc56f1f10e0ce7c3f0d2b60e34b83393c Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Mon, 15 Mar 2021 19:29:40 +0200
Subject: [PATCH 1/3] Revert interval check for telemetry subscription

---
 .../subscription/DefaultSubscriptionManagerService.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
index b73641e9ad..844db92de8 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
@@ -434,9 +434,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene
             if (curTs > value) {
                 long startTs = subscription.getStartTime() > 0 ? Math.max(subscription.getStartTime(), value + 1L) : (value + 1L);
                 long endTs = subscription.getEndTime() > 0 ? Math.min(subscription.getEndTime(), curTs) : curTs;
-                if (startTs > 1) {
-                    queries.add(new BaseReadTsKvQuery(key, startTs, endTs, 0, 1000, Aggregation.NONE));
-                }
+                queries.add(new BaseReadTsKvQuery(key, startTs, endTs, 0, 1000, Aggregation.NONE));
             }
         });
         if (!queries.isEmpty()) {

From 48d1199b2b2f5de9ba9b9448bef90d16bd9a0eb7 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 16 Mar 2021 11:11:41 +0200
Subject: [PATCH 2/3] Fix deprecation warnings

---
 .../server/transport/coap/CoapTransportResource.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
index 7f3212e7ce..c1fd5b6a4a 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
@@ -304,7 +304,8 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
     }
 
     private String getTokenFromRequest(Request request) {
-        return request.getSource().getHostAddress() + ":" + request.getSourcePort() + ":" + request.getTokenString();
+        return (request.getSourceContext() != null ? request.getSourceContext().getPeerAddress().getAddress().getHostAddress() : "null")
+                + ":" + (request.getSourceContext() != null ? request.getSourceContext().getPeerAddress().getPort() : -1) + ":" + request.getTokenString();
     }
 
     private Optional<DeviceTokenCredentials> decodeCredentials(Request request) {

From ae4de0c3d17f7c09b24d2a496fc297ea2d7a717b Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Tue, 16 Mar 2021 10:14:52 +0200
Subject: [PATCH 3/3] updated httpclient, spring-boot, netty versions

---
 msa/black-box-tests/pom.xml | 2 +-
 pom.xml                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index cefbdf140b..5189242663 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -37,7 +37,7 @@
         <blackBoxTests.skip>true</blackBoxTests.skip>
         <testcontainers.version>1.9.1</testcontainers.version>
         <zeroturnaround.version>1.10</zeroturnaround.version>
-        <httpclient.version>4.5.6</httpclient.version>
+        <httpclient.version>4.5.13</httpclient.version>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 3f1bf9faea..beaedb9447 100755
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
         <javax-annotation.version>1.3.2</javax-annotation.version>
         <jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
         <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
-        <spring-boot.version>2.3.5.RELEASE</spring-boot.version>
+        <spring-boot.version>2.3.9.RELEASE</spring-boot.version>
         <spring.version>5.2.10.RELEASE</spring.version>
         <spring-security.version>5.4.1</spring-security.version>
         <spring-data-redis.version>2.4.1</spring-data-redis.version>
@@ -75,7 +75,7 @@
         <grpc.version>1.22.1</grpc.version>
         <lombok.version>1.18.18</lombok.version>
         <paho.client.version>1.2.4</paho.client.version>
-        <netty.version>4.1.53.Final</netty.version>
+        <netty.version>4.1.60.Final</netty.version>
         <os-maven-plugin.version>1.5.0</os-maven-plugin.version>
         <rabbitmq.version>4.8.0</rabbitmq.version>
         <surfire.version>2.19.1</surfire.version>