Commit a1336f3893cb869cb317a7b5eda2c71f2e862393
Committed by
Andrew Shvayka
1 parent
0c3d1556
updated protobuf version to 3.17.2 & added explicit fields presence support
Showing
2 changed files
with
6 additions
and
6 deletions
... | ... | @@ -223,7 +223,7 @@ public class ProtoMqttAdaptor implements MqttTransportAdaptor { |
223 | 223 | |
224 | 224 | private String dynamicMsgToJson(byte[] bytes, Descriptors.Descriptor descriptor) throws InvalidProtocolBufferException { |
225 | 225 | DynamicMessage dynamicMessage = DynamicMessage.parseFrom(descriptor, bytes); |
226 | - return JsonFormat.printer().includingDefaultValueFields().print(dynamicMessage); | |
226 | + return JsonFormat.printer().print(dynamicMessage); | |
227 | 227 | } |
228 | 228 | |
229 | 229 | } | ... | ... |
... | ... | @@ -75,8 +75,8 @@ |
75 | 75 | <mail.version>1.6.2</mail.version> |
76 | 76 | <curator.version>4.2.0</curator.version> |
77 | 77 | <zookeeper.version>3.5.5</zookeeper.version> |
78 | - <protobuf.version>3.11.4</protobuf.version> | |
79 | - <grpc.version>1.36.0</grpc.version> | |
78 | + <protobuf.version>3.17.2</protobuf.version> | |
79 | + <grpc.version>1.38.0</grpc.version> | |
80 | 80 | <lombok.version>1.18.18</lombok.version> |
81 | 81 | <paho.client.version>1.2.4</paho.client.version> |
82 | 82 | <netty.version>4.1.60.Final</netty.version> |
... | ... | @@ -113,7 +113,7 @@ |
113 | 113 | <commons-collections.version>3.2.2</commons-collections.version> |
114 | 114 | <java-websocket.version>1.5.0</java-websocket.version> |
115 | 115 | <micrometer.version>1.5.2</micrometer.version> |
116 | - <protobuf-dynamic.version>1.0.2TB</protobuf-dynamic.version> | |
116 | + <protobuf-dynamic.version>1.0.3TB</protobuf-dynamic.version> | |
117 | 117 | <wire-schema.version>3.4.0</wire-schema.version> |
118 | 118 | <twilio.version>7.54.2</twilio.version> |
119 | 119 | <hibernate-validator.version>6.0.13.Final</hibernate-validator.version> |
... | ... | @@ -684,7 +684,7 @@ |
684 | 684 | <plugin> |
685 | 685 | <groupId>org.xolstice.maven.plugins</groupId> |
686 | 686 | <artifactId>protobuf-maven-plugin</artifactId> |
687 | - <version>0.5.0</version> | |
687 | + <version>0.6.1</version> | |
688 | 688 | <configuration> |
689 | 689 | <!-- |
690 | 690 | The version of protoc must match protobuf-java. If you don't depend on |
... | ... | @@ -694,7 +694,7 @@ |
694 | 694 | <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} |
695 | 695 | </protocArtifact> |
696 | 696 | <pluginId>grpc-java</pluginId> |
697 | - <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier} | |
697 | + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} | |
698 | 698 | </pluginArtifact> |
699 | 699 | </configuration> |
700 | 700 | <executions> | ... | ... |