From a1336f3893cb869cb317a7b5eda2c71f2e862393 Mon Sep 17 00:00:00 2001
From: ShvaykaD <dshvaika@thingsboard.io>
Date: Wed, 9 Jun 2021 17:03:05 +0300
Subject: [PATCH] updated protobuf version to 3.17.2 & added explicit fields
 presence support

---
 .../transport/mqtt/adaptors/ProtoMqttAdaptor.java      |  2 +-
 pom.xml                                                | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
index a007c73a5a..da7aaab4f6 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
@@ -223,7 +223,7 @@ public class ProtoMqttAdaptor implements MqttTransportAdaptor {
 
     private String dynamicMsgToJson(byte[] bytes, Descriptors.Descriptor descriptor) throws InvalidProtocolBufferException {
         DynamicMessage dynamicMessage = DynamicMessage.parseFrom(descriptor, bytes);
-        return JsonFormat.printer().includingDefaultValueFields().print(dynamicMessage);
+        return JsonFormat.printer().print(dynamicMessage);
     }
 
 }
diff --git a/pom.xml b/pom.xml
index db120d4560..248baec7cd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -75,8 +75,8 @@
         <mail.version>1.6.2</mail.version>
         <curator.version>4.2.0</curator.version>
         <zookeeper.version>3.5.5</zookeeper.version>
-        <protobuf.version>3.11.4</protobuf.version>
-        <grpc.version>1.36.0</grpc.version>
+        <protobuf.version>3.17.2</protobuf.version>
+        <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.60.Final</netty.version>
@@ -113,7 +113,7 @@
         <commons-collections.version>3.2.2</commons-collections.version>
         <java-websocket.version>1.5.0</java-websocket.version>
         <micrometer.version>1.5.2</micrometer.version>
-        <protobuf-dynamic.version>1.0.2TB</protobuf-dynamic.version>
+        <protobuf-dynamic.version>1.0.3TB</protobuf-dynamic.version>
         <wire-schema.version>3.4.0</wire-schema.version>
         <twilio.version>7.54.2</twilio.version>
         <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
@@ -684,7 +684,7 @@
                 <plugin>
                     <groupId>org.xolstice.maven.plugins</groupId>
                     <artifactId>protobuf-maven-plugin</artifactId>
-                    <version>0.5.0</version>
+                    <version>0.6.1</version>
                     <configuration>
                         <!--
                           The version of protoc must match protobuf-java. If you don't depend on
@@ -694,7 +694,7 @@
                         <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
                         </protocArtifact>
                         <pluginId>grpc-java</pluginId>
-                        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier}
+                        <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
                         </pluginArtifact>
                     </configuration>
                     <executions>