From 2ec2e7179dc32ebea0053f7eb9ea16eb757c4704 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 10:28:22 +0300
Subject: [PATCH 01/16] dependency management: org.springframework:spring-core
 (version with no change, exclusions replaced with transitive dependency
 management

---
 pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 687b6031fd..1eff6471d8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1059,23 +1059,11 @@
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-oauth2-client</artifactId>
                 <version>${spring-security.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-oauth2-jose</artifactId>
                 <version>${spring-security.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>

From 3ce5c27cb6173483d20b890dd0ff7e3c03a3a5bf Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 10:46:18 +0300
Subject: [PATCH 02/16] dependency management: com.fasterxml (version unified
 with general jackson.version (no change), exclusions replaced with transitive
 dependency management), fasterxml-classmate version defined

---
 pom.xml | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1eff6471d8..b759fc51d4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,7 @@
         <commons-io.version>2.11.0</commons-io.version>
         <commons-csv.version>1.4</commons-csv.version>
         <jackson.version>2.12.1</jackson.version>
-        <jackson-annotations.version>2.12.1</jackson-annotations.version>
-        <jackson-core.version>2.12.1</jackson-core.version>
+        <fasterxml-classmate.version>1.3.4</fasterxml-classmate.version>
         <json-schema-validator.version>2.2.6</json-schema-validator.version>
         <californium.version>2.6.1</californium.version>
         <leshan.version>2.0.0-M3</leshan.version>
@@ -1260,12 +1259,42 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-core</artifactId>
-                <version>${jackson-core.version}</version>
+                <version>${jackson.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
-                <version>${jackson-annotations.version}</version>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-cbor</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jdk8</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-joda</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-parameter-names</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml</groupId>
+                <artifactId>classmate</artifactId>
+                <version>${fasterxml-classmate.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.github.fge</groupId>
@@ -1545,12 +1574,6 @@
                 <groupId>de.ruedigermoeller</groupId>
                 <artifactId>fst</artifactId>
                 <version>${fst.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-core</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.springfox.ui</groupId>

From f8f92494e8357bf578fe02512265659e9321e054 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 12:17:02 +0300
Subject: [PATCH 03/16] dependency management: io.netty (version unified with
 general netty.version (no change), exclusions replaced with transitive
 dependency management)

---
 pom.xml | 76 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index b759fc51d4..4f2450a7a1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1208,7 +1208,22 @@
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
-                <artifactId>netty-handler</artifactId>
+                <artifactId>netty-buffer</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-http</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-http2</artifactId>
                 <version>${netty.version}</version>
             </dependency>
             <dependency>
@@ -1216,6 +1231,53 @@
                 <artifactId>netty-codec-mqtt</artifactId>
                 <version>${netty.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-socks</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-common</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler-proxy</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-resolver</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-epoll</artifactId>
+                <version>${netty.version}</version>
+                <classifier>linux-x86_64</classifier>
+            </dependency>
+            <dependency> <!-- brought by com.microsoft.azure:azure-servicebus -->
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-kqueue</artifactId>
+                <version>${netty.version}</version>
+                <classifier>osx-x86_64</classifier>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-unix-common</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.datastax.oss</groupId>
                 <artifactId>java-driver-core</artifactId>
@@ -1405,12 +1467,6 @@
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-netty</artifactId>
                 <version>${grpc.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.netty</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
@@ -1609,12 +1665,6 @@
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-servicebus</artifactId>
                 <version>${azure-servicebus.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.netty</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.passay</groupId>

From bf938a45e7a805329f2411e83b7feb5eb7e8670a Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 16 Aug 2021 09:16:41 +0300
Subject: [PATCH 04/16] grpc: grpc-netty replaced with grpc-netty-shaded to
 decouple grpc and netty versions in the project (CE)

---
 application/pom.xml | 2 +-
 pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/pom.xml b/application/pom.xml
index 03832654fa..4f24d4a5ad 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -231,7 +231,7 @@
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
+            <artifactId>grpc-netty-shaded</artifactId>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
diff --git a/pom.xml b/pom.xml
index 4f2450a7a1..e5217e8ad6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1465,7 +1465,7 @@
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
-                <artifactId>grpc-netty</artifactId>
+                <artifactId>grpc-netty-shaded</artifactId>
                 <version>${grpc.version}</version>
             </dependency>
             <dependency>

From f73f08047534cd4e6d598910636e64fa399c40cb Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 16 Aug 2021 10:09:26 +0300
Subject: [PATCH 05/16] grpc: grpc-netty replaced with grpc-netty-shaded
 (edge-api)

---
 common/edge-api/pom.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/common/edge-api/pom.xml b/common/edge-api/pom.xml
index 3915ea7bec..ed19be3480 100644
--- a/common/edge-api/pom.xml
+++ b/common/edge-api/pom.xml
@@ -87,17 +87,7 @@
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>netty-transport</artifactId>
-                    <groupId>io.netty</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>netty-common</artifactId>
-                    <groupId>io.netty</groupId>
-                </exclusion>
-            </exclusions>
+            <artifactId>grpc-netty-shaded</artifactId>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>

From 11720e076f3704ca8a0573de478b1ec043d2ed8f Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 12:38:58 +0300
Subject: [PATCH 06/16] grpc: replaced imports for grpc-netty-shaded
 (io.grpc.netty. -> io.grpc.netty.shaded.io.grpc.netty.) (CE)

---
 .../thingsboard/server/service/edge/rpc/EdgeGrpcService.java  | 2 +-
 .../main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
index e118a0b0c2..730daf3f28 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import io.grpc.Server;
-import io.grpc.netty.NettyServerBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
 import io.grpc.stub.StreamObserver;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java b/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
index 4c74fdc2f9..70d985ef64 100644
--- a/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
+++ b/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
@@ -17,8 +17,8 @@ package org.thingsboard.edge.rpc;
 
 import com.google.common.io.Resources;
 import io.grpc.ManagedChannel;
-import io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
 import io.grpc.stub.StreamObserver;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;

From e565725099556e176c858b89201eb335a9fb710c Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 13:07:41 +0300
Subject: [PATCH 07/16] dependency management: added commons-codec
 commons-logging in dep management (only greater available version in the
 classpath left)

---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index e5217e8ad6..d188bf371f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,9 @@
         <guava.version>28.2-jre</guava.version>
         <caffeine.version>2.6.1</caffeine.version>
         <commons-lang3.version>3.4</commons-lang3.version>
+        <commons-codec.version>1.15</commons-codec.version>
         <commons-io.version>2.11.0</commons-io.version>
+        <commons-logging.version>1.2</commons-logging.version>
         <commons-csv.version>1.4</commons-csv.version>
         <jackson.version>2.12.1</jackson.version>
         <fasterxml-classmate.version>1.3.4</fasterxml-classmate.version>
@@ -1308,6 +1310,16 @@
                 <artifactId>commons-io</artifactId>
                 <version>${commons-io.version}</version>
             </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${commons-codec.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${commons-logging.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-csv</artifactId>

From d8455aca258a8ff605235692b709cf78ae3330ce Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 13:14:53 +0300
Subject: [PATCH 08/16] dependency management: removed unnecessary exclude
 commons-io from org.owasp.antisamy because commons-io already defined in
 dependencyManagement (transitive dependency are managed as well)

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index d188bf371f..352fc13809 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1776,10 +1776,6 @@
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs-annotations</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>

From 381f5d4efc143ffb167a2c0a6befbf6aca5706f8 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 13:24:16 +0300
Subject: [PATCH 09/16] dependency management: joda-time unified only newer
 available version in the classpath left (2.3, 2.4, 2.8.1 -> 2.8.1)

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 352fc13809..56cccd7d1c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
         <commons-io.version>2.11.0</commons-io.version>
         <commons-logging.version>1.2</commons-logging.version>
         <commons-csv.version>1.4</commons-csv.version>
+        <joda-time.version>2.8.1</joda-time.version>
         <jackson.version>2.12.1</jackson.version>
         <fasterxml-classmate.version>1.3.4</fasterxml-classmate.version>
         <json-schema-validator.version>2.2.6</json-schema-validator.version>
@@ -1325,6 +1326,11 @@
                 <artifactId>commons-csv</artifactId>
                 <version>${commons-csv.version}</version>
             </dependency>
+            <dependency>
+                <groupId>joda-time</groupId>
+                <artifactId>joda-time</artifactId>
+                <version>${joda-time.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>

From 70c59af33ad1987d9bd86128bbc99bdb86ec732e Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 13:50:06 +0300
Subject: [PATCH 10/16] dependency management: apache httpclient (4.5.2, 4.5.13
 -> 4.5.13), httpcore (4.4.5, 4.4.13, 4.4.14 -> 4.4.14)

---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index 56cccd7d1c..19e1b376db 100755
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,8 @@
         <commons-io.version>2.11.0</commons-io.version>
         <commons-logging.version>1.2</commons-logging.version>
         <commons-csv.version>1.4</commons-csv.version>
+        <apache-httpclient.version>4.5.13</apache-httpclient.version>
+        <apache-httpcore.version>4.4.14</apache-httpcore.version>
         <joda-time.version>2.8.1</joda-time.version>
         <jackson.version>2.12.1</jackson.version>
         <fasterxml-classmate.version>1.3.4</fasterxml-classmate.version>
@@ -1326,6 +1328,16 @@
                 <artifactId>commons-csv</artifactId>
                 <version>${commons-csv.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${apache-httpclient.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>${apache-httpcore.version}</version>
+            </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>

From 08736754c4682846e2b24023503fd17edd48ad06 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 14:00:52 +0300
Subject: [PATCH 11/16] dependency management: removed aws.sdk.version (already
 defined in the root pom.xml with the same version)

---
 rule-engine/rule-engine-components/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index ccd905f897..0a05e4967d 100644
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@@ -35,7 +35,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
-        <aws.sdk.version>1.11.747</aws.sdk.version>
         <google.common.protos.version>1.16.0</google.common.protos.version>
     </properties>
 
@@ -93,7 +92,6 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-sns</artifactId>
-            <version>${aws.sdk.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>

From 9b7b0ac7bc04fabc8982517afff2a85989172405 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 14:08:58 +0300
Subject: [PATCH 12/16] dependency management: proto-google-common-protos
 (1.16.0, 1.17.0, 2.0.1 -> 2.0.1 /required by common used grpc 1.38.0/ ).
 Version management moved to the root

---
 pom.xml                                    | 6 ++++++
 rule-engine/rule-engine-components/pom.xml | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 19e1b376db..f83c8fa52e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
         <snakeyaml.version>1.27</snakeyaml.version>
         <aws.sdk.version>1.11.747</aws.sdk.version>
         <pubsub.client.version>1.105.0</pubsub.client.version>
+        <google.common.protos.version>2.1.0</google.common.protos.version> <!-- required by io.grpc:grpc-protobuf:1.38.0-->
         <azure-servicebus.version>3.2.0</azure-servicebus.version>
         <passay.version>1.5.0</passay.version>
         <ua-parser.version>1.4.3</ua-parser.version>
@@ -1691,6 +1692,11 @@
                 <artifactId>google-cloud-pubsub</artifactId>
                 <version>${pubsub.client.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.api.grpc</groupId>
+                <artifactId>proto-google-common-protos</artifactId>
+                <version>${google.common.protos.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.microsoft.azure</groupId>
                 <artifactId>azure-servicebus</artifactId>
diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index 0a05e4967d..73615c1c1b 100644
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@@ -35,7 +35,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
-        <google.common.protos.version>1.16.0</google.common.protos.version>
     </properties>
 
     <dependencies>
@@ -100,7 +99,6 @@
         <dependency>
             <groupId>com.google.api.grpc</groupId>
             <artifactId>proto-google-common-protos</artifactId>
-            <version>${google.common.protos.version}</version>
         </dependency>
         <dependency>
             <groupId>com.rabbitmq</groupId>

From 8dea07938ed8b15d22af3cfb959b4c230987bf49 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 16:28:06 +0300
Subject: [PATCH 13/16] msa-black-box-tests: httpclient dependency version
 inherited from the root pom.xml

---
 msa/black-box-tests/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index 6d4465f3c4..000fc23510 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -36,7 +36,6 @@
         <main.dir>${basedir}/../..</main.dir>
         <testcontainers.version>1.11.4</testcontainers.version>
         <zeroturnaround.version>1.10</zeroturnaround.version>
-        <httpclient.version>4.5.13</httpclient.version>
     </properties>
 
     <dependencies>
@@ -57,7 +56,6 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
         </dependency>
         <dependency>
             <groupId>io.takari.junit</groupId>

From aefb7e4bb3767794790f2e548ee2366cd6035b46 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 23 Aug 2021 18:59:54 +0300
Subject: [PATCH 14/16] added netty-tcnative-boringssl-static.version
 2.0.41.Final along with netty-all to support SSL

---
 application/pom.xml                 | 8 ++++++++
 common/edge-api/pom.xml             | 5 +++++
 common/transport/mqtt/pom.xml       | 4 ++++
 pom.xml                             | 6 ++++++
 rule-engine/rule-engine-api/pom.xml | 5 +++++
 5 files changed, 28 insertions(+)

diff --git a/application/pom.xml b/application/pom.xml
index 4f24d4a5ad..4cb7f777cd 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -229,6 +229,14 @@
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-tcnative-boringssl-static</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
diff --git a/common/edge-api/pom.xml b/common/edge-api/pom.xml
index ed19be3480..1e685baaf8 100644
--- a/common/edge-api/pom.xml
+++ b/common/edge-api/pom.xml
@@ -81,6 +81,11 @@
             <artifactId>netty-all</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-tcnative-boringssl-static</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/common/transport/mqtt/pom.xml b/common/transport/mqtt/pom.xml
index e3e3d3bab7..fb2fffc777 100644
--- a/common/transport/mqtt/pom.xml
+++ b/common/transport/mqtt/pom.xml
@@ -44,6 +44,10 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-tcnative-boringssl-static</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
diff --git a/pom.xml b/pom.xml
index f83c8fa52e..7c832dd800 100755
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@
         <lombok.version>1.18.18</lombok.version>
         <paho.client.version>1.2.4</paho.client.version>
         <netty.version>4.1.66.Final</netty.version>
+        <netty-tcnative-boringssl-static.version>2.0.41.Final</netty-tcnative-boringssl-static.version>
         <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
         <rabbitmq.version>4.8.0</rabbitmq.version>
         <surfire.version>2.19.1</surfire.version>
@@ -1212,6 +1213,11 @@
                 <artifactId>netty-all</artifactId>
                 <version>${netty.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-tcnative-boringssl-static</artifactId>
+                <version>${netty-tcnative-boringssl-static.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-buffer</artifactId>
diff --git a/rule-engine/rule-engine-api/pom.xml b/rule-engine/rule-engine-api/pom.xml
index 03fa42b606..bb7c8d1095 100644
--- a/rule-engine/rule-engine-api/pom.xml
+++ b/rule-engine/rule-engine-api/pom.xml
@@ -63,6 +63,11 @@
             <artifactId>netty-all</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-tcnative-boringssl-static</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

From b020b051c55ad81e3c2f8d5dcd90e33cbfc43fcb Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Tue, 24 Aug 2021 19:00:23 +0300
Subject: [PATCH 15/16] tests: maven-surefire-plugin upgraded 3.0.0-M1 ->
 3.0.0-M5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7c832dd800..33ecd7855a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -651,7 +651,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M1</version>
+                    <version>3.0.0-M5</version>
                     <configuration>
                         <argLine>
                             --illegal-access=permit

From ecf049b5c6554c653b35bf0f03a07738dcd142be Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Wed, 25 Aug 2021 08:05:52 +0300
Subject: [PATCH 16/16] dependency: netty latest 4.1.67,
 netty-tcnative-boringssl 2.0.40 (according to the optional netty-transport
 dependency)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 33ecd7855a..70e4dac72e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -85,8 +85,8 @@
         <grpc.version>1.38.0</grpc.version>
         <lombok.version>1.18.18</lombok.version>
         <paho.client.version>1.2.4</paho.client.version>
-        <netty.version>4.1.66.Final</netty.version>
-        <netty-tcnative-boringssl-static.version>2.0.41.Final</netty-tcnative-boringssl-static.version>
+        <netty.version>4.1.67.Final</netty.version>
+        <netty-tcnative-boringssl-static.version>2.0.40.Final</netty-tcnative-boringssl-static.version>
         <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
         <rabbitmq.version>4.8.0</rabbitmq.version>
         <surfire.version>2.19.1</surfire.version>