diff --git a/application/pom.xml b/application/pom.xml
index 9a782ea46d..ad2f5da18c 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -229,9 +229,17 @@
com.google.protobuf
protobuf-java
+
+ io.netty
+ netty-all
+
+
+ io.netty
+ netty-tcnative-boringssl-static
+
io.grpc
- grpc-netty
+ grpc-netty-shaded
io.grpc
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/pom.xml b/common/edge-api/pom.xml
index 3915ea7bec..1e685baaf8 100644
--- a/common/edge-api/pom.xml
+++ b/common/edge-api/pom.xml
@@ -81,23 +81,18 @@
netty-all
provided
+
+ io.netty
+ netty-tcnative-boringssl-static
+ provided
+
com.google.guava
guava
io.grpc
- grpc-netty
-
-
- netty-transport
- io.netty
-
-
- netty-common
- io.netty
-
-
+ grpc-netty-shaded
io.grpc
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 4be3324411..1b7dd85f9a 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
@@ -16,8 +16,8 @@
package org.thingsboard.edge.rpc;
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 io.netty.handler.ssl.SslContextBuilder;
import lombok.extern.slf4j.Slf4j;
diff --git a/common/transport/mqtt/pom.xml b/common/transport/mqtt/pom.xml
index cec03bb318..01c94ff0e1 100644
--- a/common/transport/mqtt/pom.xml
+++ b/common/transport/mqtt/pom.xml
@@ -44,6 +44,10 @@
io.netty
netty-all
+
+ io.netty
+ netty-tcnative-boringssl-static
+
org.springframework
spring-context-support
diff --git a/pom.xml b/pom.xml
index 592dff41ae..e04a327e26 100755
--- a/pom.xml
+++ b/pom.xml
@@ -56,11 +56,15 @@
28.2-jre
2.6.1
3.4
+ 1.15
2.11.0
+ 1.2
1.4
+ 4.5.13
+ 4.4.14
+ 2.8.1
2.12.1
- 2.12.1
- 2.12.1
+ 1.3.4
2.2.6
2.6.1
2.0.0-M3
@@ -73,7 +77,8 @@
1.38.0
1.18.18
1.2.4
- 4.1.66.Final
+ 4.1.67.Final
+ 2.0.40.Final
1.7.0
4.8.0
2.19.1
@@ -97,6 +102,7 @@
1.27
1.11.747
1.105.0
+ 2.1.0
3.2.0
1.5.0
1.4.3
@@ -647,7 +653,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 3.0.0-M1
+ 3.0.0-M5
--illegal-access=permit
@@ -1061,23 +1067,11 @@
org.springframework.security
spring-security-oauth2-client
${spring-security.version}
-
-
- org.springframework
- spring-core
-
-
org.springframework.security
spring-security-oauth2-jose
${spring-security.version}
-
-
- org.springframework
- spring-core
-
-
org.springframework
@@ -1229,7 +1223,27 @@
io.netty
- netty-handler
+ netty-tcnative-boringssl-static
+ ${netty-tcnative-boringssl-static.version}
+
+
+ io.netty
+ netty-buffer
+ ${netty.version}
+
+
+ io.netty
+ netty-codec
+ ${netty.version}
+
+
+ io.netty
+ netty-codec-http
+ ${netty.version}
+
+
+ io.netty
+ netty-codec-http2
${netty.version}
@@ -1237,6 +1251,53 @@
netty-codec-mqtt
${netty.version}
+
+ io.netty
+ netty-codec-socks
+ ${netty.version}
+
+
+ io.netty
+ netty-common
+ ${netty.version}
+
+
+ io.netty
+ netty-handler
+ ${netty.version}
+
+
+ io.netty
+ netty-handler-proxy
+ ${netty.version}
+
+
+ io.netty
+ netty-resolver
+ ${netty.version}
+
+
+ io.netty
+ netty-transport
+ ${netty.version}
+
+
+ io.netty
+ netty-transport-native-epoll
+ ${netty.version}
+ linux-x86_64
+
+
+ io.netty
+ netty-transport-native-kqueue
+ ${netty.version}
+ osx-x86_64
+
+
+ io.netty
+ netty-transport-native-unix-common
+ ${netty.version}
+
com.datastax.oss
java-driver-core
@@ -1267,11 +1328,36 @@
commons-io
${commons-io.version}
+
+ commons-codec
+ commons-codec
+ ${commons-codec.version}
+
+
+ commons-logging
+ commons-logging
+ ${commons-logging.version}
+
org.apache.commons
commons-csv
${commons-csv.version}
+
+ org.apache.httpcomponents
+ httpclient
+ ${apache-httpclient.version}
+
+
+ org.apache.httpcomponents
+ httpcore
+ ${apache-httpcore.version}
+
+
+ joda-time
+ joda-time
+ ${joda-time.version}
+
com.fasterxml.jackson.core
jackson-databind
@@ -1280,12 +1366,42 @@
com.fasterxml.jackson.core
jackson-core
- ${jackson-core.version}
+ ${jackson.version}
com.fasterxml.jackson.core
jackson-annotations
- ${jackson-annotations.version}
+ ${jackson.version}
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-cbor
+ ${jackson.version}
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jdk8
+ ${jackson.version}
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-joda
+ ${jackson.version}
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+ ${jackson.version}
+
+
+ com.fasterxml.jackson.module
+ jackson-module-parameter-names
+ ${jackson.version}
+
+
+ com.fasterxml
+ classmate
+ ${fasterxml-classmate.version}
com.github.fge
@@ -1394,14 +1510,8 @@
io.grpc
- grpc-netty
+ grpc-netty-shaded
${grpc.version}
-
-
- io.netty
- *
-
-
io.grpc
@@ -1574,12 +1684,6 @@
de.ruedigermoeller
fst
${fst.version}
-
-
- com.fasterxml.jackson.core
- jackson-core
-
-
io.springfox.ui
@@ -1611,16 +1715,15 @@
google-cloud-pubsub
${pubsub.client.version}
+
+ com.google.api.grpc
+ proto-google-common-protos
+ ${google.common.protos.version}
+
com.microsoft.azure
azure-servicebus
${azure-servicebus.version}
-
-
- io.netty
- *
-
-
org.passay
@@ -1720,10 +1823,6 @@
com.github.spotbugs
spotbugs-annotations
-
- commons-io
- commons-io
-
diff --git a/rule-engine/rule-engine-api/pom.xml b/rule-engine/rule-engine-api/pom.xml
index 2530532938..b624459baa 100644
--- a/rule-engine/rule-engine-api/pom.xml
+++ b/rule-engine/rule-engine-api/pom.xml
@@ -63,6 +63,11 @@
netty-all
provided
+
+ io.netty
+ netty-tcnative-boringssl-static
+ provided
+
com.google.guava
guava
diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index 6809641eae..751976ece1 100644
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@@ -35,8 +35,6 @@
UTF-8
${basedir}/../..
- 1.11.747
- 1.16.0
@@ -93,7 +91,6 @@
com.amazonaws
aws-java-sdk-sns
- ${aws.sdk.version}
com.google.cloud
@@ -102,7 +99,6 @@
com.google.api.grpc
proto-google-common-protos
- ${google.common.protos.version}
com.rabbitmq